Re: tree-conflicts with 'add' -- was: Re: wc-ng patch review
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 09 Nov 2009 13:23:26 +0000
Neels J Hofmeyr wrote:
Tests exist:
tree_conflict_tests.py 4 8 12 16
> Does anyone remember what our aim was?
Add vs. add: should be a tree conflict.
(Future enhancements: Implement an option to silently merge the two
- Julian
------------------------------------------------------
|
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.