About mergemaster (Re: upgrading)

[Nick Barnes]

At 2003-09-23 00:58:37+0000, Peter Jeremy writes:

> The difficulty here is determing the 'unchanged from default' case.
> MD5 checksums in an mtree database could give you a yes/no answer but
> isn't extensible - once you start talking about comparing your current
> file to the default, the next obvious request is the ability to do a
> 3-way merge.  IMHO, just detecting that a file has or hasn't changed
> from the then default is of very little benefit without the ability to
> do a 3-way merge of differences.

Indeed.  How hard would it be for mergemaster to keep a copy of the
release tree off to one side (in /var/)?  Then a subsequent
mergemaster could offer 3-way merge.

I keep changed config files in our corporate Perforce (SCM)
repository, so can already do three-way merges.

Nick Barnes