Feature Request: improve merging of .hgsub

Matt Mackall mpm at selenic.com
Tue Aug 10 11:59:55 CDT 2010


On Tue, 2010-08-10 at 09:33 -0700, Chad Dombrova wrote:
> if mercurial tracked the list of controlled files the way it tracks
> subrepos, as a simple text file that was merged like any other,
> mercurial users would give up in frustration.

Yes, let's be melodramatic.

We assume that users know how to edit and merge simple text files.
Otherwise, they're going to have a really hard time using Mercurial
anyway.

Automatic merging of .hgsub only breaks right now when a) two people
modify it 'simultaneously' and b) they do it in a way that conflicts.
Making a custom merger for .hgsub will only slightly narrow the set of
cases that conflict (mostly by taking line ordering out of the picture).

So you've only slightly improved some cases and moved from an occasional
clunky text file merge to what's effectively our only other option: an
less frequent but considerably more clunky set of interactive prompts
(and a bunch of ugly new code and tests and bugs to go with it). I'm
afraid I don't see that as an improvement.

Further, if a team is so uncoordinated that this is anything but a blue
moon occurrence, they've got much bigger problems. 

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list