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

Re: Resetting a brach to the trunk

From: Robert P. J. Day <rpjday_at_mindspring.com>
Date: 2005-08-11 13:38:47 CEST

On Thu, 11 Aug 2005, Tom Locke wrote:

> Hi,
> Say I have:
> /trunk
> /branches/tom
> And I've just merged changes in foo into the trunk, so the branch and trunk
> are identical.
> Now say I want to continue to use this branch as my personal sandbox. When I
> come to do my next merge into the trunk, I'll need to know the revision number
> where I started hacking (i.e. the one I'm at now).
> I could either:
> a) Make a fresh "svn copy" of the trunk to my branch and work from that. In
> this case I can always find where the brach started with "svn log
> --stop-on-copy", but I loose the continued ancestory of all my own personal
> changes.
> b) Make a note that the branch was in sync with the trunk at revision X, so
> I can later merge changes from X:HEAD. (the obvious place for that note being
> the commit comment for the merge I just did)

when you did that merge, you should have made it clear in the comment
for the merge what revisions were involved. see:


where you see the commit command:

$ svn commit -m "Merged my-calc-branch changes r341:405 into the


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 11 13:41:14 2005

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.