Re: Is CVS better for viewing commit history??

Reedick, Andrew wrote:

> Ex: Create branch/foo.java (which has 5 checkins and 2 branches of
> history) and trunk/foo.java (which has 10 checkins and 4 branches of
> history). Each is a separate file object with different histories.
> When you merge branch to trunk, most systems will require you to pick
> one file object or the other. So after the merge, instead of one
> unified object with 15 checkins and 6 branches of history, you have to
> pick one file object, thus losing the other object's history. In such a
> case you'll probably keep the 10 checkins and 4 branches file object.
>
> In short, branch/foo.java and trunk/foo.java are little independent
> databases, and there's no reliable, automated way to merge databases.
>
> So to avoid Evil Twins, you would need to create foo.java on one and
> only one branch, and then merge foo.java to the other branch(es) in
> order to have a complete history for the file "foo.java".

I think this makes a good argument for doing nearly all development on
the trunk, branching only for releases or for major changes where, when
complete, the branch will replace the trunk.

-- 
   Les Mikesell
    lesmikesell@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org