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

Timothee Besset <ttimo@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
Received on Sun Apr 6 01:02:56 2003