Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: Does one ever branch without merging?

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: Does one ever branch without merging?

Author Les Mikesell <lesmikesell at gmail dot com>
Full name Les Mikesell <lesmikesell at gmail dot com>
Date 2009-10-19 05:58:46 PDT
Message Michael 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?

As far as subversion is concerned you can copy from any part of the tree to any
other. The trunk/branches/tags names and locations are just conventions. But,
the problem I see here is that you are going to duplicate a bunch of code and
will likely make small changes here and there and end up having to make future
changes in multiple copies as you improve them. A better approach would be to
split the code into 3 projects, each with its own trunk/branches/tags layout,
with code that is used by both main projects kept separately and pulled in with
an external reference. That way you only have to maintain this code once, but
the main projects can be tied to different revisions for different builds as it
changes over time.

--
   Les Mikesell
    lesmikesell at gmail dot com

« Previous message in topic | 5 of 5 | Next message in topic »

Messages

Show all messages in topic

Does one ever branch without merging? Michael <mbw234 at gmail dot com> Michael <mbw234 at gmail dot com> 2009-10-18 19:57:41 PDT
     Re: Does one ever branch without merging? gavinbaumanis Gavin Baumanis 2009-10-18 22:38:43 PDT
         Re: Does one ever branch without merging? Michael <mbw234 at gmail dot com> Michael <mbw234 at gmail dot com> 2009-10-18 22:58:42 PDT
             Re: Does one ever branch without merging? Brett Coon <brett dot coon at gmail dot com> Brett Coon <brett dot coon at gmail dot com> 2009-10-19 00:22:58 PDT
             Re: Does one ever branch without merging? Les Mikesell <lesmikesell at gmail dot com> Les Mikesell <lesmikesell at gmail dot com> 2009-10-19 05:58:46 PDT
Messages per page: