mergemaster improvement (auto-update for not modified files)

Julian Elischer julian at elischer.org
Tue May 3 11:13:43 PDT 2005


John Hay wrote:
> On Tue, May 03, 2005 at 01:27:09PM +0400, Denis Peplin wrote:
> 
>>The mergemaster with this is test patch (attached)
>>can auto-update files that was not modified.
>>
>>It do this by compairing each file with it's CVS
>>copy. If file was not modified, it can be rewritten.
>>
>>This dramatically redices amount of files that require
>>admin's attention.
>>
>>There is one major problem here:
>>This can be done in single-user mode only if your
>>have local CVS repository, because if local CVS is
>>not exist, anoncvs is used.
>>
>>Possible solutions:
> 
> 
> What about mergemaster storing a copy of the original somewhere on disk
> for usage next time? Then the first run may still be slow, but following
> runs will be able to use it.
> 
> John

Mergemaster could keep checksums of known revisions.

it wouldn't take much to have just one file with the last 35 checksums of each 
file. (maybe with the $FreeBSD$ line removed if it differs..)



More information about the freebsd-hackers mailing list