best merge method

read the svn book, but am still not getting it.

I have:

studioz/branches/studioz-v2/*files for site
studioz/trunk/*files for site

I'm doing development on both the trunk and the branch at the same
time. Most of these changes should not cause conflicts. However, I
would like to merge the trunk up onto the main site without having to
specifically use revision numbers.

So far, I have been successfully doing it with revision numbers ala:

svn merge -r 16:26 http://svn.whichever.com/svn/repos/studioz/trunk .

However, what I would rather do is something like this:

cd studioz/branches/studioz-v2
svn merge -r HEAD:HEAD http://svn.whichever.com/svn/repos/studioz/trunk
.

In other words, merge all the changes from the trunk that are 'new'
onto the branch. I can see where 'new' is relative, but shouldn't svn
be able to figure this out?

It is a pain to have to manually remember the last time I did a merge.
I have been putting it into the commit messages, but things still get
confusing for me quickly. Is there a better method to remember this
stuff?

jon

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 10 20:10:52 2004