Update on my previous tree conflict scenario

Julian asked me to look at my previous scenario with current trunk.

As a refresher it was a relatively simple case. I have local edits to
a file that has been renamed in HEAD. I perform an update which
creates a tree conflict. Here is a current transcript beginning with
the update.

$ svn up
   C trunk/src/com/acme/ui/editors/ColorManager.java
A trunk/src/com/acme/ui/editors/MyColorManager.java
U trunk/src/com/acme/ui/editors/XMLTagScanner.java
U trunk/src/com/acme/ui/editors/XMLEditor.java
U trunk/src/com/acme/ui/editors/XMLConfiguration.java
U trunk/src/com/acme/ui/editors/XMLScanner.java
Updated to revision 4.
Summary of conflicts:
  Tree conflicts: 1
$ svn st
M C trunk/src/com/acme/ui/editors/ColorManager.java
M trunk/src/com/acme/ui/editors/MyColorManager.java

OK, so we have created a tree conflict and we have left
ColorManager.java as a versioned file. I think for a while we were
unversioning it, but as long as the WC handles this situation we will
be OK.

$ svn diff | vim

Just verified I see diffs. In this case, diff shows me the edits in
ColorManager were transferred to MyColorManager, which is a cool but
relatively rare scenario.

I am not exactly sure what to do, so I am going to try some stuff:

$ svn resolved trunk/src/com/acme/ui/editors/ColorManager.java
Resolved conflicted state of 'trunk/src/com/acme/ui/editors/ColorManager.java'
$ svn st
M trunk/src/com/acme/ui/editors/ColorManager.java
M trunk/src/com/acme/ui/editors/MyColorManager.java

Not really what I wanted. I wanted to essentially delete my local
file and remove it from WC.

$ svn up
   C trunk/src/com/acme/ui/editors/ColorManager.java
At revision 4.
Summary of conflicts:
  Tree conflicts: 1
$ svn st
M C trunk/src/com/acme/ui/editors/ColorManager.java
M trunk/src/com/acme/ui/editors/MyColorManager.java

Tree conflict was put back. This is kind of good. I think it shows
that the WC is being managed better now. I am going to try another
way to resolve this.

$ svn revert trunk/src/com/acme/ui/editors/ColorManager.java
Reverted 'trunk/src/com/acme/ui/editors/ColorManager.java'
$ svn st
M trunk/src/com/acme/ui/editors/MyColorManager.java

This probably makes sense. Revert left the file as a versioned file
in my WC, but it is no longer conflicted.

$ svn up
D trunk/src/com/acme/ui/editors/ColorManager.java
Updated to revision 4.

And now svn up just removes it. It was good that it knew not to
create a tree conflict again, since there were no longer local
modifications.

So I think there is some confusion still about what to do, but overall
the code seems to be working well.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org