Re: Getting To Git (was Re: [MENTORS] Current Branching Strategy Vote Results)

[Alex Harui]

On 8/16/12 12:38 AM, "Justin Mclean" <jus...@classsoftware.com> wrote:

> Hi,
> 
> Well first concern is will the Git branching model actually work with SVN as
> described in the document? It wasn't designed with SVN in mind.
In the prior discussions, nobody came up with a reason the branches shown in
the article couldn't be done in SVN, but we should expect greater merge pain
when merging, and I would avoid major refactoring in the next release.

There was a post I read about git-svn that might be helpful.  I will try to
find that tomorrow.  It talked about what kind of Git branching can mess up
git-svn.  We should try to avoid that for now.
> 
> So what changes need to be made to the process it in order for us with work
> cleanly with SVN?
I think we have to be careful about making lots of branches, but I think SVN
can handle the branching in the diagram.

> For instance how is history going to be managed when
> merging? 
History will be handled however SVN handles merging and history.

> How do we share the local branches that would exist in git?
That may be one thing we can't do, but I don't think that was in the
diagram, but I'm also not familiar enough with Git to say for sure.

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui