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

Re: 'svn merge' interface

From: Ben Collins <bcollins_at_debian.org>
Date: 2002-04-03 00:58:13 CEST

> * USES of 'svn merge':
>

I'm trying to figure out which of these uses applies to this case:

svn copy http://server/svn/trunk http://server/svn/branches/my-branch

svn co http://server/svn/branches/my-branch

(over some weeks, mods take place on trunk)

cd my-branch
svn merge http://server/svn/trunk (syntax?)

IOW, I want to magically merge in all changes to trunk, from the time
that my-branch was created. IMO, this is a very important feature for
branches. You could fit this into your model by noting what rev of trunk
you copied my-branch, and continually note the new rev everytime you
merged, but that's a hassle, prone to mistakes.

Any ideas?

-- 
Debian     - http://www.debian.org/
Linux 1394 - http://linux1394.sourceforge.net/
Subversion - http://subversion.tigris.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 3 01:02:37 2002

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