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

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

From: Timothee Besset <ttimo_at_idsoftware.com>
Date: 2003-04-06 00:22:37 CEST

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 <sussman@collab.net> wrote:

> 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
>
>

---------------------------------------------------------------------
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:23:24 2003

This is an archived mail posted to the Subversion Dev mailing list.