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

question on svn merge without revision numbers

From: Emin.shopper Martinian.shopper <emin.shopper_at_gmail.com>
Date: 2007-07-21 00:03:21 CEST

Dear Experts,

Almost all the documentation I've seen on svn merge suggests using a
revision number for things to merge. Is this really necessary?

Let's say I create a branch called foo and work on it for a while. Then I
want to merge it back into the trunk. Can I just do

svn merge <URL-for-branch> <URL-for-trunk> <URL-for-trunk>

to merge it back into the trunk? Similarly, if I want to merge the trunk
into the branch, can I just do

 svn merge <URL-for-trunk> <URL-for-branch> <URL-for-branch>

From my reading of the svn documentation, it seems like svn merge A B C
should compare A and B and apply the changes to C so this should work.

What are the issues that make the svn documentation focus so heavily on
doing merges by revision number? If your branch has 20 revisions, doesn't it
get painful to have to do a separate merge command for each revision?

Received on Sat Jul 21 00:02:33 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.