Position of merge/diff in en/decode chain
Hans-Peter Oeri
hp at oeri.ch
Tue Apr 20 05:03:39 CDT 2010
Hi!
On 04/19/2010 06:14 PM, Matt Mackall wrote:
> The one exception to this rule is file merge, which is generally
> performed by an external tool directly on the file in the working
> directory. Thus, the premerge code also works on files in the working
> directory form for consistency.
>
So this is the only "dogma breach"? If no one considers this worth it, I
might try to learn python to find a solution myself ;)
> confusion that can result if everyone doesn't have matching
> configuration and the difficulty in synchronizing such config in a
> system intrinsically lacking trust and authority.
>
I agree it would be cumbersome in 'big' audiences. For smaller groups,
like internal development or office teams, however, I don't think it's
that big of an issue.
HP
More information about the Mercurial
mailing list