Re: tree-conflicts with 'add'
From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Mon, 09 Nov 2009 15:49:36 +0100
Julian Foad wrote:
Sorry, I only looked in update_tests.py and switch_tests.py; thanks for this
>
But I see now that although these are successful, we still don't have tests
Add-vs.-add during update/switch only become tree-conflicts when the local
Did we at some point decide to not flag simple local adds as tree-conflicts?
> Add vs. add: should be a tree conflict.
(agreed)
~Neels
P.S.: A permutation map of my tests, if you're interested.
So we currently only flag an add-vs.-add in 6 out of these 18 cases that I
permutations:
3 * 2 * 3 == 18
(1): only the permutations with local node added with history are detected
(dir vs. file, i.e. local dir & incoming file, still untested, I assume is
------------------------------------------------------
|
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.