Resetting a brach to the trunk

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)

Which is the preferred way of doing things?

Thanks

Tom.

p.s. If I go for (a), it seems I have to "svn rm" my branch, then
commit, then "svn copy" the trunk over and commit again. I can't figure
out how to do it in one commit. Can I?

---------------------------------------------------------------------
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:32:50 2005