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

Please review Symmetric Merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 13 Sep 2012 23:55:30 +0100 (BST)

Hi, merge fans and QA fans.

As you've seen, the 'symmetric merge' code is live in trunk and destined to be in 1.8.

The principle is nice; however, the current implementation is a rather ugly hack, being just a layer on top of the existing 'sync' and 'reintegrate' merge code.

Please review it and send me all your criticism and suggestions.  Seriously.

I intend to do some self-review as well, but there's nothing like one of you fellow developers looking at it to motivate me to fix it :-)

Thanks.

- Julian
Received on 2012-09-14 00:56:05 CEST

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.