[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: Rob van Oostrum <rob.vanoostrum_at_blastradius.com>
Date: 2004-03-12 22:38:15 CET

> -----Original Message-----
> From: Ove Kaaven [mailto:ovek@arcticnet.no]
> Sent: Friday, March 12, 2004 4:26 PM
> To: Rob van Oostrum
> Cc: users@subversion.tigris.org
> Subject: RE: branching several times a day (was Re: Sourcesafe user
> needs primer on branching source control)
>
>
> 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.

Not exactly ... by "top" I mean the start of the branch ... by "bottom" the
latest on the branch ... anyways ...

Of course I tag the point from which I create the branch. And of course I
can do a diff between that tag and any point on the branch (tag or latest).
My point was that by merging trunk changes into a branch, the difference
between the top and bottom of the branch no longer represents just the
changes made on that branch for the purpose the branch was created, but also
whatever difference between the start of the branch and points further down
on the trunk you chose to merge into the branch. This may not be an issue in
a lot of environments, but it is a major pain in the butt in mine ...

cheers
Rob

---------------------------------------------------------------------
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:38:58 2004

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