flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Erik de Bruin <e...@ixsoftware.nl>
Subject Re: SVN to Git migration in progress
Date Wed, 13 Mar 2013 14:03:23 GMT
I HAVE been learning git. I have been migrating from SVN to git and
while ranting on the list I've been "learning on the job". I have git
all set up and running and all the Falcon projects are 'checked out',
set up and compiling again. I also moved all my uncommitted changes
from SVN to git. There are now 8 major and 4 minor 'commits' ready to
be 'pushed' to whatever branch they are intended to end up on
(feature?, develop?, release?, master?). This has been a lot of
work... And now you're telling me that without discussion or even
notice, INFRA has decided to waste some more of my time by undoing the
entire effort?

Nice!

EdB



On Wed, Mar 13, 2013 at 2:49 PM, Frédéric THOMAS
<webdoublefx@hotmail.com> wrote:
> It's not the best workflow I ever seen, for sure but given we're stuck on
> it, it's better to let it continue 'till the end, it doesn't serve us to
> slow it down at this point.
>
>
>> Now, to be clear: we now can write to SVN again, and all commits
>
> should go to SVN?
>
> NO or that's gonna be lost.
> DON'T DO ANYTHING (learn git in between or watch kitten video).
>
>
> -Fred
>
> -----Message d'origine----- From: Erik de Bruin
> Sent: Wednesday, March 13, 2013 2:42 PM
>
> To: dev@flex.apache.org
> Subject: Re: SVN to Git migration in progress
>
> Well, shouldn't there have been some kind of discussion first, before
> such a drastic step as this is taken?
>
> We just learned from Bertrand that there are no Dictators in
> Apache.org, but the way INFRA is behaving, it seems like he was wrong.
>
> I propose that from now on all major actions wrt. git are discussed on
> the list first and then decided with either a [VOTE] or [LAZY].
>
> Now, to be clear: we now can write to SVN again, and all commits
> should go to SVN?
>
> EdB
>
>
>
> On Wed, Mar 13, 2013 at 2:33 PM, Frédéric THOMAS
> <webdoublefx@hotmail.com> wrote:
>>
>> There're some issues relative to the history of the develop branch of the
>> flex-sdk git and the master of the utilities git, it can't be resolved w/o
>> to do the all process again.
>>
>>
>> -Fred
>>
>> -----Message d'origine----- From: Erik de Bruin
>> Sent: Wednesday, March 13, 2013 2:27 PM
>> To: dev@flex.apache.org
>> Subject: Re: SVN to Git migration in progress
>>
>>
>> Before I totally freak out, please explain to me what just happened?
>> Why did INFRA abort the migration?
>>
>> EdB
>>
>>
>>
>> On Wed, Mar 13, 2013 at 2:25 PM, Frédéric THOMAS
>> <webdoublefx@hotmail.com> wrote:
>>>
>>>
>>> Hi Erik,
>>>
>>> Yes, we're going to do the all process again until everything is ok.
>>> You shouldn't start working on git until this point (we're all locked at
>>> the
>>> moment), in between, you can do a patch, that should be easy to re-apply
>>> against the final version.
>>>
>>>
>>> -Fred
>>>
>>> -----Message d'origine----- From: Erik de Bruin
>>> Sent: Wednesday, March 13, 2013 2:18 PM
>>> To: dev@flex.apache.org
>>> Subject: Re: AW: SVN to Git migration in progress
>>>
>>>
>>> What does that mean? I have spent 2 days moving from SVN to git. Right
>>> now my entrire FlexJS MXML in FalconJx contribution is in git. Does
>>> this message mean that we go back to SVN? What does that mean for the
>>> work I already did in git, will I have to do the whole setup over
>>> again?
>>>
>>> If true, I'll go back to ranting... and no kittens will stop me this
>>> time!
>>>
>>> EdB
>>>
>>>
>>>
>>> On Wed, Mar 13, 2013 at 1:34 PM, Frédéric THOMAS
>>> <webdoublefx@hotmail.com> wrote:
>>>>
>>>>
>>>>
>>>> Just an update from the infra [1] :
>>>>
>>>> <danielsh_> Fine, I've made your svn space rw again. That does mean
>>>> we'll
>>>> have to do the "make ro, create git repo, review it, make rw" dance from
>>>> the
>>>> start sometime later.
>>>>
>>>> I suppose we can't commit in between ?
>>>>
>>>> <danielsh_> The critical section is that the git repo must receive
no
>>>> commits while the PMC audits it. And that's usually accompanied by
>>>> freezing
>>>> svn (except site) to avoid a split brain condition. IOW if you commit to
>>>> svn, git won't have those commits when made writable.
>>>>
>>>> -Fred
>>>>
>>>> [1] https://issues.apache.org/jira/browse/INFRA-5549#comment-13601070
>>>>
>>>> -----Message d'origine----- From: christofer.dutz@c-ware.de
>>>> Sent: Wednesday, March 13, 2013 12:32 PM
>>>>
>>>> To: dev@flex.apache.org
>>>> Subject: AW: SVN to Git migration in progress
>>>>
>>>> Well in our case this would simply could be any committer of the
>>>> project.
>>>> At
>>>> the time of me writing that article Velo was the only person with commit
>>>> rights to the central repo :-)
>>>>
>>>> ________________________________________
>>>> Von: Gordon Smith [gosmith@adobe.com]
>>>> Gesendet: Dienstag, 12. März 2013 18:32
>>>> An: dev@flex.apache.org
>>>> Betreff: RE: SVN to Git migration in progress
>>>>
>>>>> "What happens here is that you commit to a publically accessible
>>>>> repository clone on GitHub that only you can commit to and then issue
a
>>>>> "Pull Request" to Velo. He can now review your changes and pull these
>>>>> changes from your private fork at GitHub. If he likes what you did, he
>>>>> will
>>>>> apply your patches to the trunk and you're done."
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> Who is going to be the Velo for Apache Flex? That person is going to be
>>>> very
>>>> busy!
>>>>
>>>> - Gordon
>>>>
>>>>
>>>> -----Original Message-----
>>>> From: christofer.dutz@c-ware.de [mailto:christofer.dutz@c-ware.de]
>>>> Sent: Tuesday, March 12, 2013 9:00 AM
>>>> To: dev@flex.apache.org
>>>> Subject: AW: SVN to Git migration in progress
>>>>
>>>> I once wrote up the workflow of contributing to Flexmojos using Git ...
>>>> as
>>>> the workflow for Flex is now the same, perhaps it explains a little and
>>>> helps clear the confusion with git:
>>>>
>>>> https://dev.c-ware.de/confluence/display/PUBLIC/Contributing+to+Flexmojos
>>>>
>>>> Chris
>>>>
>>>> ________________________________________
>>>> Von: Erik de Bruin [erik@ixsoftware.nl]
>>>> Gesendet: Dienstag, 12. März 2013 13:08
>>>> An: dev@flex.apache.org
>>>> Betreff: Re: SVN to Git migration in progress
>>>>
>>>> What advantage is having a local repo to having a local working copy?
>>>> It seems to me that all it does is add an extra layer between me and my
>>>> co-contributors. I need to 'commit' to my local repo and then 'push' to
>>>> get
>>>> it out to the world, where before only a 'commit' was needed...
>>>>
>>>> EdB
>>>>
>>>>
>>>>
>>>> On Tue, Mar 12, 2013 at 1:03 PM, Carlos Rovira
>>>> <carlos.rovira@codeoscopic.com> wrote:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> commit is like SVN, you are making a commit in your *local* repo.
>>>>>
>>>>> When GIT will became RW, you will be able to "push" to the remote repo
>>>>> sharing your changes.
>>>>>
>>>>> In Git you have a fully functional local repo, and there's a shared
>>>>> one remotely while in SVN there's only one remotely...
>>>>>
>>>>>
>>>>>
>>>>> 2013/3/12 Erik de Bruin <erik@ixsoftware.nl>
>>>>>
>>>>>> Joao,
>>>>>>
>>>>>> Thank you... but that went right over my head. I'm still at the stage
>>>>>> where I'm trying to grok the difference between 'commit' and 'push'...
>>>>>> I'll get there, but I'm so not pleased with (the timing) of this
move
>>>>>> that you all get to enjoy my wining about it until I have the
>>>>>> FalconJx stuff - which I had nicely lined up for a SVN commit -
>>>>>> working again in the new git repos I've been forced to make, and
my
>>>>>> code is safely 'staged/committed/pushed' for all to enjoy.
>>>>>>
>>>>>> EdB
>>>>>>
>>>>>>
>>>>>>
>>>>>> On Tue, Mar 12, 2013 at 12:14 PM, João Fernandes
>>>>>> <joaopedromartinsfernandes@gmail.com> wrote:
>>>>>> > Eric, If you want to learn the basics behind git you can try
>>>>>> > http://pcottle.github.com/learnGitBranching/ , it helped me.
>>>>>> >
>>>>>> >
>>>>>> > On 12 March 2013 09:14, Erik de Bruin <erik@ixsoftware.nl>
wrote:
>>>>>> >
>>>>>> >> Are you sure?
>>>>>> >>
>>>>>> >> I did a 'git clone' and 'build.properties' shows:
>>>>>> >>
>>>>>> >> # flex-sdk-description values
>>>>>> >> release = Apache Flex 4.9.1
>>>>>> >> release.version = 4.9.1
>>>>>> >>
>>>>>> >> While the develop branch in SVN has:
>>>>>> >>
>>>>>> >> # flex-sdk-description values
>>>>>> >> release = Apache Flex 4.10.0
>>>>>> >> release.version = 4.10.0
>>>>>> >>
>>>>>> >> Oops?
>>>>>> >>
>>>>>> >> EdB
>>>>>> >>
>>>>>> >>
>>>>>> >> On Tue, Mar 12, 2013 at 10:04 AM, Frédéric THOMAS
>>>>>> >> <webdoublefx@hotmail.com> wrote:
>>>>>> >> > it contains a copy of the develop branch you should
do: git
>>>>>> >> > clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git,
it
>>>>>> >> > will create
>>>>>> a
>>>>>> >> new
>>>>>> >> > directory called flex-sdk, if you prefer 'develop'
append ' >> >
>>>>>> >> > develop'
>>>>>> to
>>>>>> >> the
>>>>>> >> > clone command
>>>>>> >> >
>>>>>> >> > -Fred
>>>>>> >> >
>>>>>> >> > -----Message d'origine----- From: Erik de Bruin
>>>>>> >> > Sent: Tuesday, March 12, 2013 9:40 AM
>>>>>> >> >
>>>>>> >> > To: dev@flex.apache.org
>>>>>> >> > Subject: Re: SVN to Git migration in progress
>>>>>> >> >
>>>>>> >> > Just trying to understand what just happened:
>>>>>> >> >
>>>>>> >> > https://git-wip-us.apache.org/repos/asf/flex-sdk.git
>>>>>> >> >
>>>>>> >> > Does that contain a copy of 'trunk' or of 'branches/develop'?
>>>>>> >> >
>>>>>> >> > EdB
>>>>>> >> >
>>>>>> >> >
>>>>>> >> >
>>>>>> >> > On Tue, Mar 12, 2013 at 9:16 AM, Frédéric THOMAS
>>>>>> >> > <webdoublefx@hotmail.com> wrote:
>>>>>> >> >>
>>>>>> >> >> I'm currently cloning the repo to see how it has
been done...
>>>>>> >> >>
>>>>>> >> >> -Fred
>>>>>> >> >>
>>>>>> >> >> -----Message d'origine----- From: Justin Mclean
>>>>>> >> >> Sent: Tuesday, March 12, 2013 9:11 AM
>>>>>> >> >>
>>>>>> >> >> To: dev@flex.apache.org
>>>>>> >> >> Subject: Re: SVN to Git migration in progress
>>>>>> >> >>
>>>>>> >> >> Hi,
>>>>>> >> >>
>>>>>> >> >>> Hey, textLayout is converted to git too, so
a git submodule
>>>>>> >> >>> init and
>>>>>> >> then
>>>>>> >> >>> git submodule update should do the trick, non
?
>>>>>> >> >>
>>>>>> >> >>
>>>>>> >> >> No because we need a subdirectory of the textLayout
git repo.
>>>>>> >> >>
>>>>>> >> >> Justin
>>>>>> >> >
>>>>>> >> >
>>>>>> >> >
>>>>>> >> >
>>>>>> >> > --
>>>>>> >> > 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
>>>>>> >>
>>>>>> >
>>>>>> >
>>>>>> >
>>>>>> > --
>>>>>> >
>>>>>> > João Fernandes
>>>>>>
>>>>>>
>>>>>>
>>>>>> --
>>>>>> Ix Multimedia Software
>>>>>>
>>>>>> Jan Luykenstraat 27
>>>>>> 3521 VB Utrecht
>>>>>>
>>>>>> T. 06-51952295
>>>>>> I. www.ixsoftware.nl
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> 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
>
>
>
>
> --
> 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

Mime
View raw message