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

merge issue: Revision x doesn't match existing revision y in z

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-07-19 21:06:22 CEST

        Ok, the correct response to this is to use --ignore-ancestry.
However, the dir in question is buried towards the bottom of a large
tree. If I use --ignore-ancestry, 'svn merge' does a diff instead of a
merge, which can generate excessive merge conflicts.

        Question: Am I being overly worried about using
--ignore-ancestry? Does --ignore-ancestry only affect the merge/diff of
the file contents? Or does it impact the directory merging (the 'A'dds
and 'D'eletes reported by 'svn merge'.)

        Is there a better way to bit-slap 'svn merge' into allowing me
to skip the dir in question so I can finish the merge, and then clean up
the bad dir?

I've tried the following which didn't work:

fyi: mailing list reference:

This is with subversion 1.3.0 on solaris.


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. 118

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 19 21:08:22 2006

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.