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

Re: Enabling symmetric merge, and UI details

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 22 Aug 2012 03:17:13 +0100 (BST)

Neels J Hofmeyr wrote:

> On 2012-08-03 21:25, Julian Foad wrote:
>> It's time to lose the temporary '--symmetric' option and make
>> it the default mode in 'svn'.
>
> sounds fantastic :)
>
>> <http://wiki.apache.org/subversion/SymmetricMerge#The_User.27s_Perspective>.
>
> A good read, but I can't find that "[5]" reference:
> "...we now have a better model of what merge tracking means [5]."

Ah...  In my head I have a better model of what merge tracking means.  I don't really have a good write-up to refer to.  This section <http://wiki.apache.org/subversion/SymmetricMerge#Symmetric_Merging_and_Complete_Merges> and this section <wiki.apache.org/subversion/MergeTrackingIdeas#Logical_Change_Tracking> are the closest I have.

- Julian

> ~Neels
>
> </random_dev_reply_by_neels>
>
Received on 2012-08-22 04:17:50 CEST

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