Re: A smarter mergemaster

From: Alex Zbyslaw (xfb52_at_dial.pipex.com)
Date: 09/30/05

  • Next message: Daniel O'Connor: "Re: A smarter mergemaster" 
    Date: Fri, 30 Sep 2005 14:27:00 +0100
To: Brian Candler <B.Candler@pobox.com>

    Brian Candler wrote:

    >That's my biggest bugbear with mergemaster - it asks you about
    >a zillion files in /etc/rc.d which you have to manually agree to overwrite
    >just because the RCS ID has changed. In those cases where you've not altered
    >them yourself, I think you should just get the latest version. However to do
    >this properly, you'd need checksums of the original files. [*]
    >
    >
    Not necessarily. Diff can be made to ignore changes which match
    specific regular expressions (-I), so if you can reliably match the RCS
    Id lines you can ignore those changes.

    Note, though, that this is different from files which you haven't
    changed. The new version might change more than the RCS Id, in which
    you would be back to checksums, or some such. However, a change to
    automatically install files where *only* the RCS Id had changed would be
    easier and quicker to effect than the general case of all files which
    you hadn't changed.

    --Alex

    _______________________________________________
    freebsd-hackers@freebsd.org mailing list
    http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
    To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"

  • Next message: Daniel O'Connor: "Re: A smarter mergemaster"