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

[Timothee Besset <tt...@idsoftware.com>]

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.

I haven't tried to reproduce this on a test repository. Do you think it's
worth investigating, or is this a known issue? I think I noticed some
mails about edits being lost when svn merge'ing moved files. So I suppose
this would be related.

TTimo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Ben Collins-Sussman <su...@collab.net>]

Timothee Besset <tt...@idsoftware.com> writes:

> I don't think the file had conflict markers. I didn't explicitely check,
> but the code still compiles .. so I assume there was no conflict. In any
> case I used svn resolve on each of the file in the situation (there were
> several of them, the svn mv operation affected a whole bunch of files).
> And then the svn commit ran with no problem.

Darn.  I really wanted to know if the entry in .svn/entries had a
'conflicted' marker attached.  :-(

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Timothee Besset <tt...@idsoftware.com>]

I don't think the file had conflict markers. I didn't explicitely check,
but the code still compiles .. so I assume there was no conflict. In any
case I used svn resolve on each of the file in the situation (there were
several of them, the svn mv operation affected a whole bunch of files).
And then the svn commit ran with no problem.

TTimo

On 05 Apr 2003 16:13:08 -0600
Ben Collins-Sussman <su...@collab.net> wrote:

> Timothee Besset <tt...@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
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Ben Collins-Sussman <su...@collab.net>]

Timothee Besset <tt...@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