You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Om <bi...@gmail.com> on 2013/03/13 18:40:21 UTC
Git Migration Reset
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.
*So, everyone please check-in all your changes into SVN asap. *Sometime
this evening, SVN will go read-only at which point the migration to Git
will start.
Here is David@Infra's note regarding this:
I'll start from scratch this evening. I'll make a list of svn trees and
> start down them one by one, though I'll likely get multiple done in a
> single sitting. Typically it takes 20 minutes to a few dedicated hours of
> time per svn tree > git migration. I'll probably take asjs, external and
> falcon tonight. Then the PMC needs to audit, and we can make it RW when
> you are satisfied. If we find problems with a given migration, I've had it
> take substantially longer, or be a quick fix, it depends. That said, I
> can't give you a dedicated timeline for all of this - I am doing this as a
> volunteer, and am travelling extensively this week, so I'll try and take
> care of it as I have time available.
And if you have any questions and suggestions do so quickly so I can
clarify with David. Please DO NOT post on the JIRA ticket. I will be
online for the 12 hours (at least) I plan to help shepherd this process
all the way to the end.
Thanks,
Om
[1] https://issues.apache.org/jira/browse/INFRA-5549
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
Thank you, Om! Confidence restored... somewhat ;-)
EdB
On Wed, Mar 13, 2013 at 6:40 PM, Om <bi...@gmail.com> 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.
>
> *So, everyone please check-in all your changes into SVN asap. *Sometime
> this evening, SVN will go read-only at which point the migration to Git
> will start.
>
> Here is David@Infra's note regarding this:
>
> I'll start from scratch this evening. I'll make a list of svn trees and
>> start down them one by one, though I'll likely get multiple done in a
>> single sitting. Typically it takes 20 minutes to a few dedicated hours of
>> time per svn tree > git migration. I'll probably take asjs, external and
>> falcon tonight. Then the PMC needs to audit, and we can make it RW when
>> you are satisfied. If we find problems with a given migration, I've had it
>> take substantially longer, or be a quick fix, it depends. That said, I
>> can't give you a dedicated timeline for all of this - I am doing this as a
>> volunteer, and am travelling extensively this week, so I'll try and take
>> care of it as I have time available.
>
>
>
> And if you have any questions and suggestions do so quickly so I can
> clarify with David. Please DO NOT post on the JIRA ticket. I will be
> online for the 12 hours (at least) I plan to help shepherd this process
> all the way to the end.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
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, 2013 at 10:55 PM, Om <bi...@gmail.com> wrote:
> 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.) So /flex/sdk
> is currently read only in SVN. The migration is still running and likely
> will run a few more hours. I'll update the ticket as I have more
> information.
>
> -------------
>
> Thanks,
> Om
> On Mar 13, 2013 10:40 AM, "Om" <bi...@gmail.com> 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.
>>
>> *So, everyone please check-in all your changes into SVN asap. *Sometime
>> this evening, SVN will go read-only at which point the migration to Git
>> will start.
>>
>> Here is David@Infra's note regarding this:
>>
>> I'll start from scratch this evening. I'll make a list of svn trees and
>>> start down them one by one, though I'll likely get multiple done in a
>>> single sitting. Typically it takes 20 minutes to a few dedicated hours
>>> of time per svn tree > git migration. I'll probably take asjs,
>>> external and falcon tonight. Then the PMC needs to audit, and we can
>>> make it RW when you are satisfied. If we find problems with a given
>>> migration, I've had it take substantially longer, or be a quick fix, it
>>> depends. That said, I can't give you a dedicated timeline for all of
>>> this - I am doing this as a volunteer, and am travelling extensively this
>>> week, so I'll try and take care of it as I have time available.
>>
>>
>>
>> And if you have any questions and suggestions do so quickly so I can
>> clarify with David. Please DO NOT post on the JIRA ticket. I will be
>> online for the 12 hours (at least) I plan to help shepherd this process
>> all the way to the end.
>>
>> Thanks,
>> Om
>>
>> [1] https://issues.apache.org/jira/browse/INFRA-5549
>>
>
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
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.) So /flex/sdk
is currently read only in SVN. The migration is still running and likely
will run a few more hours. I'll update the ticket as I have more
information.
-------------
Thanks,
Om
On Mar 13, 2013 10:40 AM, "Om" <bi...@gmail.com> 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.
>
> *So, everyone please check-in all your changes into SVN asap. *Sometime
> this evening, SVN will go read-only at which point the migration to Git
> will start.
>
> Here is David@Infra's note regarding this:
>
> I'll start from scratch this evening. I'll make a list of svn trees and
>> start down them one by one, though I'll likely get multiple done in a
>> single sitting. Typically it takes 20 minutes to a few dedicated hours
>> of time per svn tree > git migration. I'll probably take asjs, external
>> and falcon tonight. Then the PMC needs to audit, and we can make it RW
>> when you are satisfied. If we find problems with a given migration, I've
>> had it take substantially longer, or be a quick fix, it depends. That
>> said, I can't give you a dedicated timeline for all of this - I am doing
>> this as a volunteer, and am travelling extensively this week, so I'll try
>> and take care of it as I have time available.
>
>
>
> And if you have any questions and suggestions do so quickly so I can
> clarify with David. Please DO NOT post on the JIRA ticket. I will be
> online for the 12 hours (at least) I plan to help shepherd this process
> all the way to the end.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549
>
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
Thank you Jose! I'll try your approach first, as it will preserve all
my commit messages etc. If that somehow doesn't work, I'll fall back
on patching or "plain old copying".
EdB
On Thu, Mar 14, 2013 at 12:11 AM, Jose Barragan
<jo...@codeoscopic.com> wrote:
> 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 <we...@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
>> <we...@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
>>> <we...@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
>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: Git Migration Reset
Posted by Jose Barragan <jo...@codeoscopic.com>.
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 <we...@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
> <we...@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
>> <we...@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
Re: Git Migration Reset
Posted by Frédéric THOMAS <we...@hotmail.com>.
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
<we...@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
> <we...@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
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
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
<we...@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
> <we...@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
Re: Git Migration Reset
Posted by Frédéric THOMAS <we...@hotmail.com>.
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
<we...@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
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
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
<we...@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
Re: Git Migration Reset
Posted by Frédéric THOMAS <we...@hotmail.com>.
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
Re: Git Migration Reset
Posted by Harbs <ha...@gmail.com>.
Sounds like a familiar workflow. I find I do that with svn far more often that I like! ;-)
On Mar 14, 2013, at 4:15 PM, christofer.dutz@c-ware.de wrote:
> Just as a suggestion ... why not clone the GIT version as soon as it's finished.
> Then delete the ".git" or ".svn" stuff from the copy you are currently working on.
> Then simply copy all the stuff from the SCM-less copy containing your changes into your clean clone.
> Git should detect unchanged, modified and new files ... only thing is that it won't detect moved or deleted files.
>
> After that ... commit ... push ... all's good and no kittens get's killed :-)
>
> Think this should work without the need to actually patch anything at all (Assuming you were the only one working on the Falcon code ... if there were more people working on this, this would be a problem though).
>
> Chris
>
> ________________________________________
> Von: Erik de Bruin [erik@ixsoftware.nl]
> Gesendet: Mittwoch, 13. März 2013 20:45
> An: dev@flex.apache.org
> Betreff: Re: Git Migration Reset
>
>> 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 time was that write enableing of the the remote copy (branch?)
> would be a matter of hours, subject only to a check by the PMC. Before
> starting work, I did check the Falcon git repo, and it looked good. It
> thing it was not unreasonable for me to expect the 'write' switch to
> be throw with the same expediency with which INFRA moved at the start
> of this episode.
>
> On the point of the "do over": I don't recall asking for such a thing.
> I understand no that the confusion might have come from the [DISCUSS]
> thread I started - note: this was AFTER INFRA took their unilateral
> action by removing the git repos and re-enabling SVN - was about
> postponing the migration until INFRA had taken their 'git' support out
> of beta and was ready to fully support it, presumably months if not
> years in the future. That thread is not VOTE or LAZY but DISCUSS. I
> specifically chose that subject so no action would be taken until a
> discussion had taken place.
>
>> Theoretically, that would work. But given that you are not too familiar
>> with Git, it would be a risky proposition. It is up to you.
>
> Well, "up to me" is not really the case, as I explained, but I
> understand it's "out of your hands." I'll make a full backup of the
> actual source files, just to make sure no code is lost when trying to
> manage the move to git.
>
> Now, before this gets out of hand, let me re-iterate: by now - by way
> of a healthy serving of tutorials and some needed distraction on
> /r/aww - I nearly understand the basics of git. I accept the project
> is moving to git, unless a new consensus on the DISCUSS thread leads
> to a new VOTE :-) I am doing my best to have my code ready for the
> migration and by sharing my experiences and frustrations with the list
> I try to smooth the way for others.
>
> TL;DR: confusion all over the place, but really there's nothing to see
> here, we're moving forward to a 'git' future.
>
> EdB
>
>
>
>> Thanks,
>> Om
>>
>>
>>>
>>>
>>> --
>>> 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
AW: Git Migration Reset
Posted by "christofer.dutz@c-ware.de" <ch...@c-ware.de>.
Just as a suggestion ... why not clone the GIT version as soon as it's finished.
Then delete the ".git" or ".svn" stuff from the copy you are currently working on.
Then simply copy all the stuff from the SCM-less copy containing your changes into your clean clone.
Git should detect unchanged, modified and new files ... only thing is that it won't detect moved or deleted files.
After that ... commit ... push ... all's good and no kittens get's killed :-)
Think this should work without the need to actually patch anything at all (Assuming you were the only one working on the Falcon code ... if there were more people working on this, this would be a problem though).
Chris
________________________________________
Von: Erik de Bruin [erik@ixsoftware.nl]
Gesendet: Mittwoch, 13. März 2013 20:45
An: dev@flex.apache.org
Betreff: Re: Git Migration Reset
> 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 time was that write enableing of the the remote copy (branch?)
would be a matter of hours, subject only to a check by the PMC. Before
starting work, I did check the Falcon git repo, and it looked good. It
thing it was not unreasonable for me to expect the 'write' switch to
be throw with the same expediency with which INFRA moved at the start
of this episode.
On the point of the "do over": I don't recall asking for such a thing.
I understand no that the confusion might have come from the [DISCUSS]
thread I started - note: this was AFTER INFRA took their unilateral
action by removing the git repos and re-enabling SVN - was about
postponing the migration until INFRA had taken their 'git' support out
of beta and was ready to fully support it, presumably months if not
years in the future. That thread is not VOTE or LAZY but DISCUSS. I
specifically chose that subject so no action would be taken until a
discussion had taken place.
> Theoretically, that would work. But given that you are not too familiar
> with Git, it would be a risky proposition. It is up to you.
Well, "up to me" is not really the case, as I explained, but I
understand it's "out of your hands." I'll make a full backup of the
actual source files, just to make sure no code is lost when trying to
manage the move to git.
Now, before this gets out of hand, let me re-iterate: by now - by way
of a healthy serving of tutorials and some needed distraction on
/r/aww - I nearly understand the basics of git. I accept the project
is moving to git, unless a new consensus on the DISCUSS thread leads
to a new VOTE :-) I am doing my best to have my code ready for the
migration and by sharing my experiences and frustrations with the list
I try to smooth the way for others.
TL;DR: confusion all over the place, but really there's nothing to see
here, we're moving forward to a 'git' future.
EdB
> Thanks,
> Om
>
>
>>
>>
>> --
>> 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
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
> 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 time was that write enableing of the the remote copy (branch?)
would be a matter of hours, subject only to a check by the PMC. Before
starting work, I did check the Falcon git repo, and it looked good. It
thing it was not unreasonable for me to expect the 'write' switch to
be throw with the same expediency with which INFRA moved at the start
of this episode.
On the point of the "do over": I don't recall asking for such a thing.
I understand no that the confusion might have come from the [DISCUSS]
thread I started - note: this was AFTER INFRA took their unilateral
action by removing the git repos and re-enabling SVN - was about
postponing the migration until INFRA had taken their 'git' support out
of beta and was ready to fully support it, presumably months if not
years in the future. That thread is not VOTE or LAZY but DISCUSS. I
specifically chose that subject so no action would be taken until a
discussion had taken place.
> Theoretically, that would work. But given that you are not too familiar
> with Git, it would be a risky proposition. It is up to you.
Well, "up to me" is not really the case, as I explained, but I
understand it's "out of your hands." I'll make a full backup of the
actual source files, just to make sure no code is lost when trying to
manage the move to git.
Now, before this gets out of hand, let me re-iterate: by now - by way
of a healthy serving of tutorials and some needed distraction on
/r/aww - I nearly understand the basics of git. I accept the project
is moving to git, unless a new consensus on the DISCUSS thread leads
to a new VOTE :-) I am doing my best to have my code ready for the
migration and by sharing my experiences and frustrations with the list
I try to smooth the way for others.
TL;DR: confusion all over the place, but really there's nothing to see
here, we're moving forward to a 'git' future.
EdB
> Thanks,
> Om
>
>
>>
>>
>> --
>> 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
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
On Wed, Mar 13, 2013 at 12:07 PM, Erik de Bruin <er...@ixsoftware.nl> 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 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.
>
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?
>
> 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
>
>
Theoretically, that would work. But given that you are not too familiar
with Git, it would be a risky proposition. It is up to you.
Thanks,
Om
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
> 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
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
On Wed, Mar 13, 2013 at 11:51 AM, Erik de Bruin <er...@ixsoftware.nl> 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't have the time tonight to reverse the
> process in a way that will allow me to be accurate and on time
If you moved it from SVN to Git - why cant you just checkin your svn
changes?
> (and no
> amout of kittens would keep me from ranting if I switched back and
> INFRA had made SVN read-only again).
>
>
Which is why I am urging you to check everything into SVN asap. The
internet is running out of kittens as we speak.
> EdB
>
> PS. "You're on your own" is not really constructive... The code I'm
> trying to save will be (I humbly think) important to the project and I
> think it's worth a bit of team effort to make sure it'll get where it
> needs going.
>
>
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
work you are doing. I wont be responding to your emails if I dint :-)
Thanks,
Om
> On Wed, Mar 13, 2013 at 7:44 PM, Om <bi...@gmail.com> wrote:
> > On Wed, Mar 13, 2013 at 11:34 AM, Erik de Bruin <er...@ixsoftware.nl>
> 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) and apply the changes that were in SVN to
> >> that clone, in as atomic commits as possible. That is what I did. I
> >> also finished the code, the changes for which I also committed to git.
> >>
> >> Now I don't see any way to get the stuff from my git repo back into my
> >> SVN repo, especially since I don't have much time left today :-(
> >>
> >> Frustration level rising again... back to viewing kittens (of the
> >> feline persuasion, to be sure)!
> >>
> >> EdB
> >>
> >>
> > I am sorry Erik, but you asked to do this from scratch. We complained to
> > Infra that both SVN and Git are read-only and hence they opened up SVN.
> > Which means that we have to live it now.
> >
> > I strongly suggest you to check in your changes into SVN soon. If not,
> you
> > are on your own. I am trying to help you here.
> >
> > Thanks,
> > Om
> >
> >
> >
> >>
> >>
> >>
> >>
> >> On Wed, Mar 13, 2013 at 7:28 PM, Om <bi...@gmail.com> wrote:
> >> > On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <er...@ixsoftware.nl>
> >> 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 which I then import into the new clone? It would be a
> >> >> hassle to have dozens of files that are changed in one long list in
> >> >> the new clone and to have to reconstruct my commits one by one...
> >> >>
> >> >> EdB
> >> >>
> >> >>
> >> > Just check it into SVN. But do it quickly. Any commit you made to
> Git
> >> is
> >> > invalid now. Please dont complicate things for yourself anymore.
> >> >
> >> > Thanks,
> >> > Om
> >> >
> >> >
> >> >>
> >> >> On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
> >> >> <ca...@codeoscopic.com> wrote:
> >> >> > 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
> >> you
> >> >> > had in SVN and you are able to continue working locally.
> >> >> >
> >> >> > Then when GIT repo has RW open...you can pull to remote.
> >> >> >
> >> >> > Things are moving now with Davids effort and he will done it from
> >> >> scratch,
> >> >> > but only want to share this info to let you know that maybe you are
> >> >> seeing
> >> >> > a problem where there is none.
> >> >> >
> >> >> > Hope that helps.
> >> >> >
> >> >> > Best,
> >> >> >
> >> >> > Carlos
> >> >> >
> >> >> >
> >> >> >
> >> >> >
> >> >> >
> >> >> > 2013/3/13 Om <bi...@gmail.com>
> >> >> >
> >> >> >> 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.
> >> >> >>
> >> >> >> *So, everyone please check-in all your changes into SVN asap.
> >> *Sometime
> >> >> >> this evening, SVN will go read-only at which point the migration
> to
> >> Git
> >> >> >> will start.
> >> >> >>
> >> >> >> Here is David@Infra's note regarding this:
> >> >> >>
> >> >> >> I'll start from scratch this evening. I'll make a list of svn
> trees
> >> and
> >> >> >> > start down them one by one, though I'll likely get multiple done
> >> in a
> >> >> >> > single sitting. Typically it takes 20 minutes to a few dedicated
> >> >> hours of
> >> >> >> > time per svn tree > git migration. I'll probably take asjs,
> >> external
> >> >> and
> >> >> >> > falcon tonight. Then the PMC needs to audit, and we can make it
> RW
> >> >> when
> >> >> >> > you are satisfied. If we find problems with a given migration,
> I've
> >> >> had
> >> >> >> it
> >> >> >> > take substantially longer, or be a quick fix, it depends. That
> >> said, I
> >> >> >> > can't give you a dedicated timeline for all of this - I am doing
> >> this
> >> >> as
> >> >> >> a
> >> >> >> > volunteer, and am travelling extensively this week, so I'll try
> and
> >> >> take
> >> >> >> > care of it as I have time available.
> >> >> >>
> >> >> >>
> >> >> >>
> >> >> >> And if you have any questions and suggestions do so quickly so I
> can
> >> >> >> clarify with David. Please DO NOT post on the JIRA ticket. I
> will
> >> be
> >> >> >> online for the 12 hours (at least) I plan to help shepherd this
> >> process
> >> >> >> all the way to the end.
> >> >> >>
> >> >> >> Thanks,
> >> >> >> Om
> >> >> >>
> >> >> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
> >> >> >>
> >> >> >
> >> >> >
> >> >> >
> >> >> > --
> >> >> > Carlos Rovira
> >> >> > Director de Tecnología
> >> >> > M: +34 607 22 60 05
> >> >> > F: +34 912 94 80 80
> >> >> > http://www.codeoscopic.com
> >> >> > http://www.directwriter.es
> >> >> > http://www.avant2.es
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> 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
>
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
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 allow me to be accurate and on time (and no
amout of kittens would keep me from ranting if I switched back and
INFRA had made SVN read-only again).
EdB
PS. "You're on your own" is not really constructive... The code I'm
trying to save will be (I humbly think) important to the project and I
think it's worth a bit of team effort to make sure it'll get where it
needs going.
On Wed, Mar 13, 2013 at 7:44 PM, Om <bi...@gmail.com> wrote:
> On Wed, Mar 13, 2013 at 11:34 AM, Erik de Bruin <er...@ixsoftware.nl> 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) and apply the changes that were in SVN to
>> that clone, in as atomic commits as possible. That is what I did. I
>> also finished the code, the changes for which I also committed to git.
>>
>> Now I don't see any way to get the stuff from my git repo back into my
>> SVN repo, especially since I don't have much time left today :-(
>>
>> Frustration level rising again... back to viewing kittens (of the
>> feline persuasion, to be sure)!
>>
>> EdB
>>
>>
> I am sorry Erik, but you asked to do this from scratch. We complained to
> Infra that both SVN and Git are read-only and hence they opened up SVN.
> Which means that we have to live it now.
>
> I strongly suggest you to check in your changes into SVN soon. If not, you
> are on your own. I am trying to help you here.
>
> Thanks,
> Om
>
>
>
>>
>>
>>
>>
>> On Wed, Mar 13, 2013 at 7:28 PM, Om <bi...@gmail.com> wrote:
>> > On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <er...@ixsoftware.nl>
>> 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 which I then import into the new clone? It would be a
>> >> hassle to have dozens of files that are changed in one long list in
>> >> the new clone and to have to reconstruct my commits one by one...
>> >>
>> >> EdB
>> >>
>> >>
>> > Just check it into SVN. But do it quickly. Any commit you made to Git
>> is
>> > invalid now. Please dont complicate things for yourself anymore.
>> >
>> > Thanks,
>> > Om
>> >
>> >
>> >>
>> >> On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
>> >> <ca...@codeoscopic.com> wrote:
>> >> > 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
>> you
>> >> > had in SVN and you are able to continue working locally.
>> >> >
>> >> > Then when GIT repo has RW open...you can pull to remote.
>> >> >
>> >> > Things are moving now with Davids effort and he will done it from
>> >> scratch,
>> >> > but only want to share this info to let you know that maybe you are
>> >> seeing
>> >> > a problem where there is none.
>> >> >
>> >> > Hope that helps.
>> >> >
>> >> > Best,
>> >> >
>> >> > Carlos
>> >> >
>> >> >
>> >> >
>> >> >
>> >> >
>> >> > 2013/3/13 Om <bi...@gmail.com>
>> >> >
>> >> >> 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.
>> >> >>
>> >> >> *So, everyone please check-in all your changes into SVN asap.
>> *Sometime
>> >> >> this evening, SVN will go read-only at which point the migration to
>> Git
>> >> >> will start.
>> >> >>
>> >> >> Here is David@Infra's note regarding this:
>> >> >>
>> >> >> I'll start from scratch this evening. I'll make a list of svn trees
>> and
>> >> >> > start down them one by one, though I'll likely get multiple done
>> in a
>> >> >> > single sitting. Typically it takes 20 minutes to a few dedicated
>> >> hours of
>> >> >> > time per svn tree > git migration. I'll probably take asjs,
>> external
>> >> and
>> >> >> > falcon tonight. Then the PMC needs to audit, and we can make it RW
>> >> when
>> >> >> > you are satisfied. If we find problems with a given migration, I've
>> >> had
>> >> >> it
>> >> >> > take substantially longer, or be a quick fix, it depends. That
>> said, I
>> >> >> > can't give you a dedicated timeline for all of this - I am doing
>> this
>> >> as
>> >> >> a
>> >> >> > volunteer, and am travelling extensively this week, so I'll try and
>> >> take
>> >> >> > care of it as I have time available.
>> >> >>
>> >> >>
>> >> >>
>> >> >> And if you have any questions and suggestions do so quickly so I can
>> >> >> clarify with David. Please DO NOT post on the JIRA ticket. I will
>> be
>> >> >> online for the 12 hours (at least) I plan to help shepherd this
>> process
>> >> >> all the way to the end.
>> >> >>
>> >> >> Thanks,
>> >> >> Om
>> >> >>
>> >> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
>> >> >>
>> >> >
>> >> >
>> >> >
>> >> > --
>> >> > Carlos Rovira
>> >> > Director de Tecnología
>> >> > M: +34 607 22 60 05
>> >> > F: +34 912 94 80 80
>> >> > http://www.codeoscopic.com
>> >> > http://www.directwriter.es
>> >> > http://www.avant2.es
>> >>
>> >>
>> >>
>> >> --
>> >> 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
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
On Wed, Mar 13, 2013 at 11:34 AM, Erik de Bruin <er...@ixsoftware.nl> 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) and apply the changes that were in SVN to
> that clone, in as atomic commits as possible. That is what I did. I
> also finished the code, the changes for which I also committed to git.
>
> Now I don't see any way to get the stuff from my git repo back into my
> SVN repo, especially since I don't have much time left today :-(
>
> Frustration level rising again... back to viewing kittens (of the
> feline persuasion, to be sure)!
>
> EdB
>
>
I am sorry Erik, but you asked to do this from scratch. We complained to
Infra that both SVN and Git are read-only and hence they opened up SVN.
Which means that we have to live it now.
I strongly suggest you to check in your changes into SVN soon. If not, you
are on your own. I am trying to help you here.
Thanks,
Om
>
>
>
>
> On Wed, Mar 13, 2013 at 7:28 PM, Om <bi...@gmail.com> wrote:
> > On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <er...@ixsoftware.nl>
> 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 which I then import into the new clone? It would be a
> >> hassle to have dozens of files that are changed in one long list in
> >> the new clone and to have to reconstruct my commits one by one...
> >>
> >> EdB
> >>
> >>
> > Just check it into SVN. But do it quickly. Any commit you made to Git
> is
> > invalid now. Please dont complicate things for yourself anymore.
> >
> > Thanks,
> > Om
> >
> >
> >>
> >> On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
> >> <ca...@codeoscopic.com> wrote:
> >> > 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
> you
> >> > had in SVN and you are able to continue working locally.
> >> >
> >> > Then when GIT repo has RW open...you can pull to remote.
> >> >
> >> > Things are moving now with Davids effort and he will done it from
> >> scratch,
> >> > but only want to share this info to let you know that maybe you are
> >> seeing
> >> > a problem where there is none.
> >> >
> >> > Hope that helps.
> >> >
> >> > Best,
> >> >
> >> > Carlos
> >> >
> >> >
> >> >
> >> >
> >> >
> >> > 2013/3/13 Om <bi...@gmail.com>
> >> >
> >> >> 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.
> >> >>
> >> >> *So, everyone please check-in all your changes into SVN asap.
> *Sometime
> >> >> this evening, SVN will go read-only at which point the migration to
> Git
> >> >> will start.
> >> >>
> >> >> Here is David@Infra's note regarding this:
> >> >>
> >> >> I'll start from scratch this evening. I'll make a list of svn trees
> and
> >> >> > start down them one by one, though I'll likely get multiple done
> in a
> >> >> > single sitting. Typically it takes 20 minutes to a few dedicated
> >> hours of
> >> >> > time per svn tree > git migration. I'll probably take asjs,
> external
> >> and
> >> >> > falcon tonight. Then the PMC needs to audit, and we can make it RW
> >> when
> >> >> > you are satisfied. If we find problems with a given migration, I've
> >> had
> >> >> it
> >> >> > take substantially longer, or be a quick fix, it depends. That
> said, I
> >> >> > can't give you a dedicated timeline for all of this - I am doing
> this
> >> as
> >> >> a
> >> >> > volunteer, and am travelling extensively this week, so I'll try and
> >> take
> >> >> > care of it as I have time available.
> >> >>
> >> >>
> >> >>
> >> >> And if you have any questions and suggestions do so quickly so I can
> >> >> clarify with David. Please DO NOT post on the JIRA ticket. I will
> be
> >> >> online for the 12 hours (at least) I plan to help shepherd this
> process
> >> >> all the way to the end.
> >> >>
> >> >> Thanks,
> >> >> Om
> >> >>
> >> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
> >> >>
> >> >
> >> >
> >> >
> >> > --
> >> > Carlos Rovira
> >> > Director de Tecnología
> >> > M: +34 607 22 60 05
> >> > F: +34 912 94 80 80
> >> > http://www.codeoscopic.com
> >> > http://www.directwriter.es
> >> > http://www.avant2.es
> >>
> >>
> >>
> >> --
> >> 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
>
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
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 atomic commits as possible. That is what I did. I
also finished the code, the changes for which I also committed to git.
Now I don't see any way to get the stuff from my git repo back into my
SVN repo, especially since I don't have much time left today :-(
Frustration level rising again... back to viewing kittens (of the
feline persuasion, to be sure)!
EdB
On Wed, Mar 13, 2013 at 7:28 PM, Om <bi...@gmail.com> wrote:
> On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <er...@ixsoftware.nl> 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 which I then import into the new clone? It would be a
>> hassle to have dozens of files that are changed in one long list in
>> the new clone and to have to reconstruct my commits one by one...
>>
>> EdB
>>
>>
> Just check it into SVN. But do it quickly. Any commit you made to Git is
> invalid now. Please dont complicate things for yourself anymore.
>
> Thanks,
> Om
>
>
>>
>> On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
>> <ca...@codeoscopic.com> wrote:
>> > 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 you
>> > had in SVN and you are able to continue working locally.
>> >
>> > Then when GIT repo has RW open...you can pull to remote.
>> >
>> > Things are moving now with Davids effort and he will done it from
>> scratch,
>> > but only want to share this info to let you know that maybe you are
>> seeing
>> > a problem where there is none.
>> >
>> > Hope that helps.
>> >
>> > Best,
>> >
>> > Carlos
>> >
>> >
>> >
>> >
>> >
>> > 2013/3/13 Om <bi...@gmail.com>
>> >
>> >> 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.
>> >>
>> >> *So, everyone please check-in all your changes into SVN asap. *Sometime
>> >> this evening, SVN will go read-only at which point the migration to Git
>> >> will start.
>> >>
>> >> Here is David@Infra's note regarding this:
>> >>
>> >> I'll start from scratch this evening. I'll make a list of svn trees and
>> >> > start down them one by one, though I'll likely get multiple done in a
>> >> > single sitting. Typically it takes 20 minutes to a few dedicated
>> hours of
>> >> > time per svn tree > git migration. I'll probably take asjs, external
>> and
>> >> > falcon tonight. Then the PMC needs to audit, and we can make it RW
>> when
>> >> > you are satisfied. If we find problems with a given migration, I've
>> had
>> >> it
>> >> > take substantially longer, or be a quick fix, it depends. That said, I
>> >> > can't give you a dedicated timeline for all of this - I am doing this
>> as
>> >> a
>> >> > volunteer, and am travelling extensively this week, so I'll try and
>> take
>> >> > care of it as I have time available.
>> >>
>> >>
>> >>
>> >> And if you have any questions and suggestions do so quickly so I can
>> >> clarify with David. Please DO NOT post on the JIRA ticket. I will be
>> >> online for the 12 hours (at least) I plan to help shepherd this process
>> >> all the way to the end.
>> >>
>> >> Thanks,
>> >> Om
>> >>
>> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
>> >>
>> >
>> >
>> >
>> > --
>> > Carlos Rovira
>> > Director de Tecnología
>> > M: +34 607 22 60 05
>> > F: +34 912 94 80 80
>> > http://www.codeoscopic.com
>> > http://www.directwriter.es
>> > http://www.avant2.es
>>
>>
>>
>> --
>> 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
Re: Git Migration Reset
Posted by Om <bi...@gmail.com>.
On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <er...@ixsoftware.nl> 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 which I then import into the new clone? It would be a
> hassle to have dozens of files that are changed in one long list in
> the new clone and to have to reconstruct my commits one by one...
>
> EdB
>
>
Just check it into SVN. But do it quickly. Any commit you made to Git is
invalid now. Please dont complicate things for yourself anymore.
Thanks,
Om
>
> On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
> <ca...@codeoscopic.com> wrote:
> > 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 you
> > had in SVN and you are able to continue working locally.
> >
> > Then when GIT repo has RW open...you can pull to remote.
> >
> > Things are moving now with Davids effort and he will done it from
> scratch,
> > but only want to share this info to let you know that maybe you are
> seeing
> > a problem where there is none.
> >
> > Hope that helps.
> >
> > Best,
> >
> > Carlos
> >
> >
> >
> >
> >
> > 2013/3/13 Om <bi...@gmail.com>
> >
> >> 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.
> >>
> >> *So, everyone please check-in all your changes into SVN asap. *Sometime
> >> this evening, SVN will go read-only at which point the migration to Git
> >> will start.
> >>
> >> Here is David@Infra's note regarding this:
> >>
> >> I'll start from scratch this evening. I'll make a list of svn trees and
> >> > start down them one by one, though I'll likely get multiple done in a
> >> > single sitting. Typically it takes 20 minutes to a few dedicated
> hours of
> >> > time per svn tree > git migration. I'll probably take asjs, external
> and
> >> > falcon tonight. Then the PMC needs to audit, and we can make it RW
> when
> >> > you are satisfied. If we find problems with a given migration, I've
> had
> >> it
> >> > take substantially longer, or be a quick fix, it depends. That said, I
> >> > can't give you a dedicated timeline for all of this - I am doing this
> as
> >> a
> >> > volunteer, and am travelling extensively this week, so I'll try and
> take
> >> > care of it as I have time available.
> >>
> >>
> >>
> >> And if you have any questions and suggestions do so quickly so I can
> >> clarify with David. Please DO NOT post on the JIRA ticket. I will be
> >> online for the 12 hours (at least) I plan to help shepherd this process
> >> all the way to the end.
> >>
> >> Thanks,
> >> Om
> >>
> >> [1] https://issues.apache.org/jira/browse/INFRA-5549
> >>
> >
> >
> >
> > --
> > Carlos Rovira
> > Director de Tecnología
> > M: +34 607 22 60 05
> > F: +34 912 94 80 80
> > http://www.codeoscopic.com
> > http://www.directwriter.es
> > http://www.avant2.es
>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>
Re: Git Migration Reset
Posted by Erik de Bruin <er...@ixsoftware.nl>.
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 dozens of files that are changed in one long list in
the new clone and to have to reconstruct my commits one by one...
EdB
On Wed, Mar 13, 2013 at 6:59 PM, Carlos Rovira
<ca...@codeoscopic.com> wrote:
> 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 you
> had in SVN and you are able to continue working locally.
>
> Then when GIT repo has RW open...you can pull to remote.
>
> Things are moving now with Davids effort and he will done it from scratch,
> but only want to share this info to let you know that maybe you are seeing
> a problem where there is none.
>
> Hope that helps.
>
> Best,
>
> Carlos
>
>
>
>
>
> 2013/3/13 Om <bi...@gmail.com>
>
>> 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.
>>
>> *So, everyone please check-in all your changes into SVN asap. *Sometime
>> this evening, SVN will go read-only at which point the migration to Git
>> will start.
>>
>> Here is David@Infra's note regarding this:
>>
>> I'll start from scratch this evening. I'll make a list of svn trees and
>> > start down them one by one, though I'll likely get multiple done in a
>> > single sitting. Typically it takes 20 minutes to a few dedicated hours of
>> > time per svn tree > git migration. I'll probably take asjs, external and
>> > falcon tonight. Then the PMC needs to audit, and we can make it RW when
>> > you are satisfied. If we find problems with a given migration, I've had
>> it
>> > take substantially longer, or be a quick fix, it depends. That said, I
>> > can't give you a dedicated timeline for all of this - I am doing this as
>> a
>> > volunteer, and am travelling extensively this week, so I'll try and take
>> > care of it as I have time available.
>>
>>
>>
>> And if you have any questions and suggestions do so quickly so I can
>> clarify with David. Please DO NOT post on the JIRA ticket. I will be
>> online for the 12 hours (at least) I plan to help shepherd this process
>> all the way to the end.
>>
>> Thanks,
>> Om
>>
>> [1] https://issues.apache.org/jira/browse/INFRA-5549
>>
>
>
>
> --
> Carlos Rovira
> Director de Tecnología
> M: +34 607 22 60 05
> F: +34 912 94 80 80
> http://www.codeoscopic.com
> http://www.directwriter.es
> http://www.avant2.es
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: Git Migration Reset
Posted by Carlos Rovira <ca...@codeoscopic.com>.
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 you
had in SVN and you are able to continue working locally.
Then when GIT repo has RW open...you can pull to remote.
Things are moving now with Davids effort and he will done it from scratch,
but only want to share this info to let you know that maybe you are seeing
a problem where there is none.
Hope that helps.
Best,
Carlos
2013/3/13 Om <bi...@gmail.com>
> 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.
>
> *So, everyone please check-in all your changes into SVN asap. *Sometime
> this evening, SVN will go read-only at which point the migration to Git
> will start.
>
> Here is David@Infra's note regarding this:
>
> I'll start from scratch this evening. I'll make a list of svn trees and
> > start down them one by one, though I'll likely get multiple done in a
> > single sitting. Typically it takes 20 minutes to a few dedicated hours of
> > time per svn tree > git migration. I'll probably take asjs, external and
> > falcon tonight. Then the PMC needs to audit, and we can make it RW when
> > you are satisfied. If we find problems with a given migration, I've had
> it
> > take substantially longer, or be a quick fix, it depends. That said, I
> > can't give you a dedicated timeline for all of this - I am doing this as
> a
> > volunteer, and am travelling extensively this week, so I'll try and take
> > care of it as I have time available.
>
>
>
> And if you have any questions and suggestions do so quickly so I can
> clarify with David. Please DO NOT post on the JIRA ticket. I will be
> online for the 12 hours (at least) I plan to help shepherd this process
> all the way to the end.
>
> Thanks,
> Om
>
> [1] https://issues.apache.org/jira/browse/INFRA-5549
>
--
Carlos Rovira
Director de Tecnología
M: +34 607 22 60 05
F: +34 912 94 80 80
http://www.codeoscopic.com
http://www.directwriter.es
http://www.avant2.es