[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Does one ever branch without merging?

From: Brett Coon <brett.coon_at_gmail.com>
Date: Mon, 19 Oct 2009 00:22:44 -0700

Beware of premature branching. This really is more of a general SCM
issue than being svn-specific, but if the two games are that similar,
might it make more sense to keep them in a single tree, so you don't
have to remember to merge/copy changes between common files?

There's a pretty good whitepaper on this topic on the Perforce website
(I think it's still there). I believe they call it the promotion vs
mainline model.

Regarding tags, svn treats them like branches. That wasn't what I
expected when I started out. You can name the tags whatever you want.

--
Brett Coon - brett.coon_at_gmail.com
On Oct 18, 2009, at 10:58 PM, Michael <mbw234_at_gmail.com> wrote:
> Thanks, that was very informative.
>
> I think I will go the branching route I explained in my original post.
> I prefer to think of the math version as a small derivation of the
> word version rather than a project all on its own. In the end I will
> probably continue branching off for the word version in other language
> too.
>
> Just to make sure though, will tagging these branches work in the way
> I would expect? I can just tag the math branch for 1.0, and the
> spanish branch for 1.2, and so on?
>
> Thanks for the help.
>
>
> On Oct 19, 1:38 am, Gavin Baumanis <gav..._at_thespidernet.com> wrote:
>> Hi Michael,
>>
>> I understand your question  - because the "normal" use for subversion
>> seems to revolve around a project.
>> with that in mind you could just relocate your current code and  
>> make a
>> separate Math quiz project.
>>
>> so lets assume you've got;
>> repoRoot
>>      |----trunk/
>>      |----branches/
>>      |----tags/
>>
>> you could use svn move and end up with something like;
>>
>> repoRoot/
>>      |----wordQuiz/
>>                      |----trunk/
>>                      |----branches/
>>                      |----tags/
>>      |----mathQuiz/
>>                      |----trunk/
>>                      |----branches/
>>                      |----tags/
>>
>> You could simply create a branch like you propose and do away with  
>> the
>> re-organisation.
>>
>> repoRoot
>>      |----trunk/
>>      |----branches/
>>                  |----mathQuiz/
>>      |----tags/
>>
>> It really is up to you - and your repository should match the way you
>> work.
>>
>> The tools you use are there to support your procedures / policies /
>> work methods.
>> While it does happen (and can be quite successful) - you should be
>> weary if a tool forces you to work in a new way.
>>
>> Gavin.
>>
>> On 19/10/2009, at 13:57 , Michael wrote:
>>
>>> I am making a word puzzle game and using svn for version control.  
>>> The
>>> game easily lends itself to a math version, and so I was thinking
>>> about handling this by branching off for the math version. Then I
>>> could make the few changes I need for the math version while
>>> continuing my main development on the main trunk. However, I would
>>> never be merging this with my main trunk.
>>
>>> Does this seem like the right way to handle such a thing?
>>
>>> ------------------------------------------------------
>>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessa 
>>> ...
>>
>>> To unsubscribe from this discussion, e-mail: [users-
>>> unsubscr..._at_subversion.tigris.org].
>>
>> ------------------------------------------------------http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessa 
>> ...
>>
>> To unsubscribe from this discussion, e-mail: [users- 
>> unsubscr..._at_subversion.tigris.org].
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2408834
>
> To unsubscribe from this discussion, e-mail: [users- 
> unsubscribe_at_subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2408856
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-19 09:26:05 CEST

This is an archived mail posted to the Subversion Users mailing list.