Cryptic merge error message

We're occasionally seeing a baffling message during an svn merge
operation. It doesn't appear to be documented, and even looking for
it in the sources didn't give me any good clues about what is wrong,
much less how to correct the problem.

The message looks like this:

 svn: Revision 68616 doesn't match existing revision 68603 in <path>

We just came up with a theory about this -- if file foo on one of the
two branches is deleted and then created (with an "svn add") that
produces this message. There are two files that are unrelated in
history but have the same name, and this produces a conflict.

So I have some questions/comments.

1. Is this theory correct? (If not, what does the message mean?)

2. It would be helpful if the message could be improved, because right
   now it doesn't have any obvious meaning.

3. When this message occurs, we're stuck -- the merge aborts and it is
   not clear (no documentation) how to correct the issue.
   What is the best way to resolve this problem? How about having
   that in the documentation?

4. It isn't clear why this is a fatal error (merge aborts). Could it
   be made non-fatal, either by default or as an option?
   If the theory is correct, it seems to me that the situation could
   just be treated as a merge conflict.

        paul

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-24 16:54:24 CET