Re: Tree conflicts - problem handling when local directory is deleted

On Thu, Jan 22, 2009 at 9:56 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> FYI I'm just about to look at this.

I added an svn info to the script to look at the tree conflict. The
problem is that after running update the local revision in the WC for
the folder is 1 when it should have been updated to 2 by the update
command. So this is why it is out of date when you try to commit.
When the tree conflict was created it should have still allowed the WC
revision to be updated.

Path: wc2/A/B/E
URL: file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E
Repository Root: file:///Users/mphippard/tree-conflicts/repos
Repository UUID: fd889f68-59a4-4395-b512-2cc3d879576e
Revision: 1
Node Kind: directory
Schedule: delete
Last Changed Author: mphippard
Last Changed Rev: 1
Last Changed Date: 2009-01-22 10:02:16 -0500 (Thu, 22 Jan 2009)
Tree conflict: local delete, incoming edit upon update
  Source left: (none)
file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E_at_1
  Source right: (dir) file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E_at_2

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1043236