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 <bigosma...@gmail.com> wrote:
> On Wed, Mar 13, 2013 at 11:34 AM, Erik de Bruin <e...@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 <bigosma...@gmail.com> wrote:
>> > On Wed, Mar 13, 2013 at 11:05 AM, Erik de Bruin <e...@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
>> >> <carlos.rov...@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 <bigosma...@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

Reply via email to