Hi Erik, I guess you've many commits on you local "old" git repo, isn't it? Well, those commits are candidates for re-apply them into the new repo when you get access to it. The most simple way to that is attach the new repo as new remote for your actual local repo:
git remote add wip https://git-wip-us.apache.org/repos/asf/flex-sdk.git git fetch --prune git -c diff.mnemonicprefix=false -c core.quotepath=false branch -m develop develop-old git -c diff.mnemonicprefix=false -c core.quotepath=false checkout -b develop --track wip/develop at this point, you'll move your commits from develop-old to develop via cherrypick, and then make a push over develop to new remote wip. hopefully it's useful... PD. Try SourceTree as UI client for Git, it's fully use for free. Best, -- Jose Barragan Software Architect Chief Codeoscopic Madrid C/. Infanta Mercedes, 92. Planta 5. 505. 28020 Madrid. Tel.: +34 912 94 80 80 On Mar 13, 2013, at 9:08 PM, Frédéric THOMAS <webdoubl...@hotmail.com> wrote: > Not the svn revision number but the git equivalent, I'm not sure but I > wonder, if the git history lenght change, the generated git equivalent (the > parent 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: 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 FalconJx... How would the SVN revision change between > yesterday and whenever the new git repo is created? > > EdB > > > > On Wed, Mar 13, 2013 at 8:57 PM, Frédéric THOMAS > <webdoubl...@hotmail.com> 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've got doubts. >> >> As you said "Time will tell", 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 make a copy of my >> commit messages and use those while patching the new 'active' >> branch... I think. >> >> Time will tell, I guess ;-) >> >> EdB >> >> >> >> On Wed, Mar 13, 2013 at 8:21 PM, Frédéric THOMAS >> <webdoubl...@hotmail.com> wrote: >>> >>> Not 100% sure because I never did it before but I guess you can do, on >>> your >>> futur inactive project : <sha> is the first commit you did. >>> >>> git format-patch -1 <sha> >>> >>> -Fred >>> >>> >>> -----Message d'origine----- From: Erik de Bruin >>> Sent: 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 changed in SVN. I spent the afternoon yesterday putting >>> the final touches to my contributions and this morning (before the >>> excrement hit the ventilator) putting all of that into a whole bunch >>> of nicely documented commits. If I were to say "f*ck it" and just >>> overlay all the most recent files over my last SVN copy, I would loose >>> all of that work. >>> >>> Also, it's 8 PM over here and I've been at this since 8 AM this >>> morning. My family is threatening to kick me and my laptop out if I >>> don't have at least one conherent conversation with them today. >>> >>>> I meant you are on your own in the sense that I (or anyone else) cannot >>>> get into your computer to fix things for you. Of course I appreciate the >>> >>> >>> >>> The way I understand it, it should be possible to clone the new repo >>> INFRA will eventually create to my local machine and make that my >>> "active project". I can then go into my current (by then "inactive") >>> project and create patches for each of the commits I prepared there, >>> and apply those patches to my active git project. Am I missing >>> something, or does that sound like it should work? >>> >>> EdB >>> >>> >>> >>> -- >>> Ix Multimedia Software >>> >>> Jan Luykenstraat 27 >>> 3521 VB Utrecht >>> >>> T. 06-51952295 >>> I. www.ixsoftware.nl >> >> >> >> >> -- >> Ix Multimedia Software >> >> Jan Luykenstraat 27 >> 3521 VB Utrecht >> >> T. 06-51952295 >> I. www.ixsoftware.nl > > > > -- > Ix Multimedia Software > > Jan Luykenstraat 27 > 3521 VB Utrecht > > T. 06-51952295 > I. www.ixsoftware.nl
