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

tree-conflicts: double-tree-conflict bug!

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Wed, 26 Nov 2008 07:01:27 +0100

With attached patch, update_tests.py 19 reports a double tree-conflict:

CMD: svn merge -r1:2
svn-test-work/working_copies/merge_tests-19/A/C --config-dir
--password rayjandom --no-auth-cache --username jrandom <TIME = 0.031309>
--- Merging r2 into 'svn-test-work/working_copies/merge_tests-19/A/C':
   C svn-test-work/working_copies/merge_tests-19/A/C/Q
   C svn-test-work/working_copies/merge_tests-19/A/C/Q
A svn-test-work/working_copies/merge_tests-19/A/C/foo
Summary of conflicts:
  Tree conflicts: 2


Received on 2008-11-26 07:01:46 CET

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.