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

Re: Merging and revision numbers

From: Thomas Wicklund <wicklund_at_eskimo.com>
Date: 2007-02-08 20:47:33 CET

Les Mikesell writes:
> Thomas Wicklund wrote:
>
> > Finding out what you've changed in a branch is also simple:
> >
> > svn diff tags/mybranch/base branches/mybranch
> >
> > Using a scheme like this, you almost never need to worry about
> > revision numbers. The only time I've dealt with revision numbers
> > lately is resurrecting a deleted branch (because I haven't had a
> > reason to automate it).
>
> But your example only deals with a single branch there, and the main
> reason for branching would be to isolate simultaneous work on several
> branches. How do you track things between branches or after some or all
> of the changes are merged back to the trunk?

My example deals with one branch (mybranch). For multiple branches
define mybranch2, mybranch3, etc. By using the branch name in both
the branch and associated tags, each branch is independent.

I currently work with 20 branches on two trunk projects. Each is
independent, each is based on a different trunk revision, and I can
easily merge to/from the trunk (or between branches if needed).

Thomas Wicklund

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 8 20:48:01 2007

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.