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

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:
> Hi tree-conflicts folks,
> I'm intrigued by the tree-conflicts code in update_editor.c that checks for
> TCs involving add. Using 'update' and 'switch', I can't find any way to
> produce a tree-conflict.
> No-one asked for tests about it, so we don't have any.

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
things if they are identical, and probably make that the default mode of

- Julian

Received on 2009-11-09 14:23:46 CET

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