Feature Request: improve merging of .hgsub

[Mads Kiilerich]

On 08/10/2010 09:32 AM, Dirkjan Ochtman wrote:
> On Tue, Aug 10, 2010 at 00:48, Chad Dombrova<chadrik at gmail.com>  wrote:
>> it's great that mercurial is flexible enough to allow a custom mergetool to
>> solve this problem, but i feel this logic should be natively implemented as
>> a special case. if this feature is something that sounds reasonable, i'd be
>> glad to make a patch for it.
>
> I think we definitely want this. Maybe you can join the development
> list, so we can figure out ways to include this in Mercurial proper?
>
> We've also talked about doing something like this for .hgtags for a long time.

On one side I agree that it could be nice to handle .hgsub 
automatically. It could be handled similar to how we handle .hgsubstate 
everywhere.

On the other side ... .hgsub is a user-edited file with a lot of 
flexibility in the syntax. Automatic merging of that file comes pretty 
close to automatic editing of hgrc - and I doubt that is something "we" 
like.

It could however see advantages of using a different format for .hgsub 
where automatic merging was feasible - and where it was simple to 
"mount" sub repositories on any valid path (containing spaces and = and 
\ and whatever). Standard disclaimers for backward compatibility applies ...

.hgtags is fortunately a more fixed format and more suitable for 
automatic merging.

/Mads