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

I don't understand the merge command at all...

From: Skip Montanaro <skip_at_pobox.com>
Date: Wed, 2 Sep 2009 19:40:20 +0000 (UTC)

svn merge seems to defeat my minimal understanding of how Subversion
works. Case in point. I have a branch, call it branches/A. This
morning I branched from it:

    svn copy branches/A branches/B

I made some changes to B, tested them, then checked them in. Then I
wanted to merge those changes back to branches/A. From my branches/A
directory I then executed

    svn merge -r 972:973 http://svnhost/.../branches/B .

972 being the highest rev svn info displayed for branches/A and 973
being the highest rev displayed for branches/B. The merge command was
completely silent.

Doing an svn info on the individual files I see they have revision
numbers higher than 973. Do I have to wander around and figure out
the highest rev of all the changed files and use that instead of 973?
Why do I need revision numbers at all? Can't it just assume the tip
of the relevant branches?

Thanks,

Skip Montanaro
skip_at_pobox.com

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390405

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-02 21:47:04 CEST

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.