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

RE: branching several times a day (was Re: Sourcesafe user needs primer on branching source control)

From: Ove Kaaven <ovek_at_arcticnet.no>
Date: 2004-03-12 22:25:53 CET

fre, 12.03.2004 kl. 20.37 skrev Rob van Oostrum:
> The potential problem with this merge into the private branch from the trunk
> before merging the private branch in to the trunk:
>
> - it destroys the integrity of the private branch. Instead of being able to
> easily identify the changes made on the branch for the purpose for which the
> branch was created (by diff-ing between the top and the bottom of the
> branch, or between any 2 tags on that branch),

The "bottom" of the branch is just the trunk at the time the branch was
created, right? And that's what you wish to diff against. So, just tag
the trunk when you merge trunk into the branch. After merging, diff the
the branch against that tag to see the actual changes in the branch.
Problem solved.

Of course, the rest of your points still stands. Just wanted to point
this out.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 12 22:26:36 2004

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