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

RE: Tree conflict: Add/Add on directory

From: Jon Foster <Jon.Foster_at_cabot.co.uk>
Date: Wed, 8 Jun 2011 12:32:01 +0100

Hi Philip,

Thanks for the patch. With that applied, the upgrade completes but
gives the wrong result. The tree conflict is reported on the parent
directory, not the conflicted directory.

I.e. SVN 1.6 correctly reports a tree conflict on a/b/foo/bar, but after
the upgrade SVN 1.7 reports the same tree conflict on a/b/foo instead.
(SVN 1.7 no longer reports any tree conflict on a/b/foo/bar).

$ svn1.7 info a/b/foo
Path: a/b/foo
Working Copy Root Path: /home/jon/test
URL: http://svnserver/repos/branches/feature7/a/b/foo
Repository Root: http://svnserver/repos
Revision: 3515
Node Kind: directory
Schedule: normal
Tree conflict: local add, incoming add upon merge
  Source left: (dir) ^/trunk/a/b/foo/bar_at_2373
  Source right: (dir) ^/trunk/a/b/foo/bar_at_3515

Kind regards,


This email and its attachments may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Cabot Communications Ltd.

If you are not the intended recipient of this email and its attachments, you must take no action based upon them, nor must you copy or show them to anyone.

Cabot Communications Limited
Verona House, Filwood Road, Bristol BS16 3RY, UK
+44 (0) 1179584232

Co. Registered in England number 02817269

Please contact the sender if you believe you have received this email in error.


This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email
Received on 2011-06-08 13:32:51 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.