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

Tree conflict bug?

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 29 Oct 2008 11:58:45 -0400

Using current trunk. I am doing some basic testing so I can figure
out JavaHL changes to make around the status/info reporting etc.

I renamed a file and committed it.

In second WC, I made some edits to file and then did update. This
reported the tree conflict. I saw stuff like this:

$ svn st
M C trunk/src/com/acme/ui/editors/ColorManager.java
M trunk/src/com/acme/ui/editors/MyColorManager.java

$ svn info trunk/src/com/acme/ui/editors/ColorManager.java
Path: trunk/src/com/acme/ui/editors/ColorManager.java
Name: ColorManager.java
URL: file:///Users/mphippard/repositories/svn-1.6/trunk/src/com/acme/ui/editors/ColorManager.java
Repository Root: file:///Users/mphippard/repositories/svn-1.6
Repository UUID: a0b8b0e8-12cc-4994-9ac8-95a1682d52c6
Revision: 4
Node Kind: file
Schedule: normal
Last Changed Author: mphippard
Last Changed Rev: 3
Last Changed Date: 2008-10-29 11:44:29 -0400 (Wed, 29 Oct 2008)
Text Last Updated: 2008-10-29 11:45:02 -0400 (Wed, 29 Oct 2008)
Checksum: df4e1705289bff7b74b555fa1ffc549d
Tree conflict:
  The update attempted to delete 'ColorManager.java'
  (possibly as part of a rename operation).
  You have edited 'ColorManager.java' locally.

What I am concerned about is that this file "ColorManager.java" still
appears to be a versioned file when in fact it no longer exists in the
repository. In my example, the edits I made to this file were
actually automatically transferred to the new file ... Cool!. So what
do I do here? I guess maybe svn resolve would have done the right

I did svn revert and the bug I am reporting is that this left
ColorManager.java in my WC with a status of "Normal". So I edited the
file and tried to commit and of course get the message that the file
does not exist. So the bug is that the WC was not handled properly.

My expectation was that svn revert would leave the file in the WC in
an Unversioned status.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-29 16:59:12 CET

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