Tree conflict bugs I've just been finding

Bug: "resolved" complains if the target's parent isn't a WC:
[[[
$ svn resolved wc2
svn: warning: '.' is not a working copy

$ svn st wc2
M C wc2/foo
]]]

Bug (minor):
[[[
$ svn resolved nonexistent
# no error
]]]

Bug: "update" hasn't actually updated to the revision it says it has,
and so marking as resolved doesn't complete the update:
[[[
$ svn up
   C foo
At revision 2.
Summary of conflicts:
  Tree conflicts: 1

$ svn up
Skipped 'foo'
At revision 2.
Summary of conflicts:
  Skipped paths: 1

$ svn st
M C foo

$ svn resolved foo
Resolved conflicted state of 'foo'

$ svn up
   C foo
At revision 2.
Summary of conflicts:
  Tree conflicts: 1
]]]

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-13 20:49:39 CET