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

Re: Pre and post bugfix tagging and mixed rev working copies

From: <kfogel_at_collab.net>
Date: 2004-12-01 20:25:13 CET

Michael Mason <mgm@eskimoman.net> writes:
> # start working on a bug fix
> svn copy -m "start bugfix branch" \
> svn://myserver/myproj/branches/RB-1.0 \
> svn://myserver/myproj/bugfixes/BUG-123
> svn copy -m "tag start of fix" \
> svn://myserver/myproj/bugfixes/BUG-123 \
> svn://myserver/myproj/bugfixes/BUG-123-START
> # check out code to work on bug
> svn checkout svn://myserver/myproj/bugfixes/BUG-123 bug-123
> # fix, doing multiple commits
> # we're done fixing, now mark the end of the bugfix
> svn copy -m "tag end of fix" \
> svn://myserver/myproj/bugfixes/BUG-123 \
> svn://olio/sesame/bugfixes/BUG-123-FINISH
> # Merge the bugfix into release 1.0's branch

Why are you tagging the start and end of the fix? That set of changes
is already isolated on the bugfix branch. You can just run

   svn log svn://myserver/myproj/bugfixes/BUG-123

to see the entire history of the fix, from bugfix branch creation to
final commit on the bugfix branch.

> cd rb-1.0
> svn update
> svn merge \
> svn://olio/sesame/bugfixes/BUG-123-START \
> svn://olio/sesame/bugfixes/BUG-123-FINISH .
> # Same merge operation to put the fix on the trunk and other branches

I'd do

   $ svn merge -rX:Y svn://olio/sesame/bugfixes/BUG-123

were X and Y are the start and end revisions of the branch.

> Couple of points here -- if I just create a bugfix branch, do I need to
> tag the start of it for later merging? This is easier than using something
> like svn log --stop-on-copy to figure out where the branch started.

You anticipated my comments :-).


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 1 20:31:02 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.