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

tree-conflicts: merge_test 19 -- was: Re: Road to 1.6: XFailing tests

From: Neels J Hofmeyr <neels_at_elego.de>
Date: Wed, 26 Nov 2008 06:56:09 +0100

Hyrum K. Wright wrote:
> XFAIL: merge_tests.py 19: merge should skip over unversioned obstructions

The output expects foo to be `Skipped', but the real output has a 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.056066>
--- Merging r2 into 'svn-test-work/working_copies/merge_tests-19/A/C':
A svn-test-work/working_copies/merge_tests-19/A/C/Q
A svn-test-work/working_copies/merge_tests-19/A/C/Q/bar
   C svn-test-work/working_copies/merge_tests-19/A/C/foo
Summary of conflicts:
  Tree conflicts: 1

C is an empty dir and receives the merge that adds some files. Only that
there exists an unversioned file `foo' in C, which obstructs the addition of
`foo' by the merge.

It looks to me like this should *not* be a tree-conflict! `foo' is
obstructed, it has nothing to do with conflicting tree changes. If foo was
locally added, that would be different.

I think we should make all the obstructions by unversioned files/dirs skip
as tested by this test. Would that be a problem?


Received on 2008-11-26 06:56:30 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.