Re: Git Migration Reset

2013-03-14 Thread Om
Update: David Nalley commented on INFRA-5549: > - > I've had to restart the flex-sdk migration twice (problems that aren't > flex issues), so I am a bit delayed. If all goes well I'll have a repo up > for you to review later tonight. Thanks, Om On Wed, Mar 13

Re: Git Migration Reset

2013-03-14 Thread Erik de Bruin
>> wrote: >>> Great though the only thing that could scary me is if the parent commit of >>> your first commit (the svn revision number) change between the 2 git >>> version, I don't know if it will happen but because the history lenght will >>> change, I

Re: Git Migration Reset

2013-03-14 Thread Harbs
ere > more people working on this, this would be a problem though). > > Chris > > > Von: Erik de Bruin [e...@ixsoftware.nl] > Gesendet: Mittwoch, 13. März 2013 20:45 > An: dev@flex.apache.org > Betreff: Re: Git Migration Reset > >> Ah, so you

Re: Git Migration Reset

2013-03-13 Thread Om
Update from David@Infra: flex/sdk is currently read-only [~bigosmallm] I've started SDK migration. Because of the concerns raised about the previous SDK migration I am working directly from SVN (as opposed to the git mirror which is where the previous migration came from.) S

Re: Git Migration Reset

2013-03-13 Thread Jose Barragan
nt commit SHA1 ids) could change, that's the risk I'm talking about, > anyway, there're other ways to make the patches in case it doesn't work, a > bit more complicated but possible. > > -Fred > > -Message d'origine- From: Erik de Bruin > Sent:

Re: Git Migration Reset

2013-03-13 Thread Frédéric THOMAS
e it doesn't work, a bit more complicated but possible. -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 9:01 PM To: dev@flex.apache.org Subject: Re: Git Migration Reset Mike and I have already agreed to not touch the code (other than locally) of

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
> > > -Fred > > -Message d'origine- From: Erik de Bruin > Sent: Wednesday, March 13, 2013 8:48 PM > > To: dev@flex.apache.org > Subject: Re: Git Migration Reset > > I seem to be able (in my GUI client) to create a patch file for the > commit(s) I have lined

Re: Git Migration Reset

2013-03-13 Thread Frédéric THOMAS
quot;, cross fingers ;-) -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 8:48 PM To: dev@flex.apache.org Subject: Re: Git Migration Reset I seem to be able (in my GUI client) to create a patch file for the commit(s) I have lined up. All I need to do is

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
: Wednesday, March 13, 2013 8:07 PM > To: dev@flex.apache.org > Subject: Re: Git Migration Reset > > >> If you moved it from SVN to Git - why cant you just checkin your svn >> changes? > > > Because git has a lot of minor changes in a lot of the same files that > were already

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
> Ah, so you made changes to the supposedly read-only git repo in the > meantime. Why would you do something like that? While at the same time > you were asking for a do over. Does not compute. What did you expect? There was nothing "read-only" about my local copy. The understanding at the tim

Re: Git Migration Reset

2013-03-13 Thread Frédéric THOMAS
Not 100% sure because I never did it before but I guess you can do, on your futur inactive project : is the first commit you did. git format-patch -1 -Fred -Message d'origine- From: Erik de Bruin Sent: Wednesday, March 13, 2013 8:07 PM To: dev@flex.apache.org Subject: Re

Re: Git Migration Reset

2013-03-13 Thread Om
On Wed, Mar 13, 2013 at 12:07 PM, Erik de Bruin wrote: > > If you moved it from SVN to Git - why cant you just checkin your svn > > changes? > > Because git has a lot of minor changes in a lot of the same files that > were already changed in SVN. I spent the afternoon yesterday putting > the fina

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
> If you moved it from SVN to Git - why cant you just checkin your svn > changes? Because git has a lot of minor changes in a lot of the same files that were already changed in SVN. I spent the afternoon yesterday putting the final touches to my contributions and this morning (before the excrement

Re: Git Migration Reset

2013-03-13 Thread Om
On Wed, Mar 13, 2013 at 11:51 AM, Erik de Bruin wrote: > Om, I understand you're trying to help and I appreciate it. If I have > somehow implied that you were somehow the one to "blaim", I'm sorry. > All I'm saying is that it took me a day and a half to get everything > from SVN to git and I don'

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
Om, I understand you're trying to help and I appreciate it. If I have somehow implied that you were somehow the one to "blaim", I'm sorry. All I'm saying is that it took me a day and a half to get everything from SVN to git and I don't have the time tonight to reverse the process in a way that will

Re: Git Migration Reset

2013-03-13 Thread Om
On Wed, Mar 13, 2013 at 11:34 AM, Erik de Bruin wrote: > Won't work, I'm not on SVN anymore (didn't want to risk having both > .git and .svn in the same project). I understood that moving from SVN > to git meant get a new clone from the git origin (i.e. create a new > working copy on my machine)

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
Won't work, I'm not on SVN anymore (didn't want to risk having both .git and .svn in the same project). I understood that moving from SVN to git meant get a new clone from the git origin (i.e. create a new working copy on my machine) and apply the changes that were in SVN to that clone, in as atomi

Re: Git Migration Reset

2013-03-13 Thread Om
On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin wrote: > Carlos, > > I have since yesterday moved all my changes to git. They are in total > 14 commits to my local clone. Do I do a patch or copy for each of > those commits separately, or is there a way of "exporting" the whole > set of commits wh

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
Carlos, I have since yesterday moved all my changes to git. They are in total 14 commits to my local clone. Do I do a patch or copy for each of those commits separately, or is there a way of "exporting" the whole set of commits which I then import into the new clone? It would be a hassle to have d

Re: Git Migration Reset

2013-03-13 Thread Carlos Rovira
Hi, it seems svn changes not in GIT are a source of problems for many of us. Only want to let you know that really it's not. All of you with a delta set of changes can extract a patch or even copy de structure of files over your git clone (maybe more easy). Then you will see the same changes that

Re: Git Migration Reset

2013-03-13 Thread Erik de Bruin
Thank you, Om! Confidence restored... somewhat ;-) EdB On Wed, Mar 13, 2013 at 6:40 PM, Om wrote: > In case you are not following the JIRA ticket, Infra has confirmed that > they have opened SVN back up for read/write. Also, they will be starting > the move to Git this evening (GMT -5) again.