Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Tree conflicts - problem handling when local directory is deleted

subversion
Discussion topic

Back to topic list

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

Author markphip
Full name Mark Phippard
Date 2009-01-22 07:04:17 PST
Message On Thu, Jan 22, 2009 at 9:56 AM, Julian Foad <julianfoad@btope​nworld.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/mphipp​ard/tree-conflicts/r​epos/trunk/A/B/E
Repository Root: file:///Users/mphipp​ard/tree-conflicts/r​epos
Repository UUID: fd889f68-59a4-4395-b​512-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/mphipp​ard/tree-conflicts/r​epos/trunk/A/B/E@1
  Source right: (dir) file:///Users/mphipp​ard/tree-conflicts/r​epos/trunk/A/B/E@2


--
Thanks

Mark Phippard
http://markphip.blogspot.com/

« Previous message in topic | 4 of 20 | Next message in topic »

Messages

Show all messages in topic

Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-21 12:22:13 PST
     Re: Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-22 06:54:50 PST
         Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-22 06:57:09 PST
             Re: Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-22 07:04:17 PST
                 Re: Tree conflicts - problem handling when local directory is deleted sbutler Stephen Butler 2009-01-22 08:07:14 PST
                     Re: Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-22 08:20:11 PST
                         Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-22 08:43:51 PST
                             Re: Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-22 08:46:46 PST
                             Skipping considered harmful (was Re: Tree conflicts - problem handling when local directory is deleted) sbutler Stephen Butler 2009-01-23 11:56:52 PST
                                 Re: Skipping considered harmful (was Re: Tree conflicts - problem handling when local directory is deleted) markphip Mark Phippard 2009-01-23 12:00:43 PST
                                 Re: Skipping considered harmful (was Re: Tree conflicts - problem handling when local directory is deleted) julianfoad Julian Foad 2009-01-27 01:26:43 PST
                                     Re: Skipping considered harmful (was Re: Tree conflicts - problem handling when local directory is deleted) sbutler Stephen Butler 2009-01-28 12:39:57 PST
                                         Re: Skipping considered harmful (was Re: Tree conflicts - problem handling when local directory is deleted) julianfoad Julian Foad 2009-02-02 09:16:13 PST
                     Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-22 08:28:31 PST
                         Re: Tree conflicts - problem handling when local directory is deleted markphip Mark Phippard 2009-01-22 08:30:41 PST
                             Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-22 08:38:29 PST
                                 Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-23 04:46:52 PST
                                     Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-23 04:50:08 PST
                                 Re: Tree conflicts - problem handling when local directory is deleted julianfoad Julian Foad 2009-01-23 08:15:12 PST
                         Re: Tree conflicts - problem handling when local directory is deleted sbutler Stephen Butler 2009-01-23 10:56:57 PST
Messages per page: