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

why merge explicit revisions from path to same path requires --ignore-ancestry?

From: Jack Bates <ms419_at_freezone.co.uk>
Date: Fri, 13 Mar 2009 11:37:48 -0700

In r1214 I merged some changes and accidentally dropped changes which
were committed after March 2nd and before r1214. I can display these
changes by typing this command, in a working copy:

 $ svn diff -r {2009-03-02}:1213

I expected I could resurrect these changes with this command:

 $ svn merge -r {2009-03-02}:1213 .

- instead, however, it simply exited with no output and no changes : (

danielsh on #svn suggested --ignore-ancestry, and sure enough, this
command merged the changes in the way I intended:

 $ svn merge -r {2009-03-02}:1213 . --ignore-ancestry

Now I am trying to understand why --ignore-ancestry was required? I have
reviewed the sections of svnbook on merge and ancestry:

- but have not found an explanation why my original merge command did
not merge the changes as I expected?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-13 19:38:51 CET

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.