Re: commit aborted because of conflict, but status doesn't show conflict state

Timothee Besset <ttimo@idsoftware.com> writes:

> I have the following:
>
> svn: Aborting commit: '/home/timo/Id/DoomSync/main/neo/framework/Heap.cpp' remains in conflict.
> timo@sparkle:~/Id/DoomSync/main$ svn status neo/framework/Heap.cpp
> A + neo/framework/Heap.cpp
>
>
> This happens after I merged a branch back into trunk, and the branch had
> some files moved around. i.e. trunk had local edits on the file, and
> branch had an svn move.

Ah... local edits existing locally, and then 'svn merge' tried to add
a file by the same name. It looks like the bug here is that the file
is in a state of conflict, but the "A +" is being displayed instead of
"C".

Does the file have conflict markers? Does the file's entry claim to
be "conflicted"?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 6 00:18:08 2003