mergemaster tips

[Lamont Granquist]

Is there any way to get mergemaster to automagically 'i'nstall over files
that you haven't touched without any user intervention?

I guess the problem here is that mergemaster is only designed to have
access to the currently checked out copy of /usr/src/etc, so it doesn't
know what state the file 'should' be in, is that correct?

What'd be really nice would be if mergemaster could automagically merge
the changes that you've made on the system with the changes from the
previous CVS version.  Obviously you could get a conflict and have to
manually merge the changes, but in a lot of cases this could probably be
minimized...

...

Could you have mergemaster save copies of the pristine /usr/src/etc files
locally on the system somewhere (in /var?) when it finishes?  Then use
that the next time it runs to figure out more stuff that it can do
automagically?

On Sun, 20 Apr 2003, Doug Barton wrote:
> On Sun, 20 Apr 2003, Anton Zavrin wrote:
> > I don't understand what is written in man pages about mergemaster,
> > that's the thing...
>
> Ok, can you give me an example of something that you don't understand? I
> tried to be quite thorough in the man page, but if people don't understand
> it, it's not doing its job.
>
> > But thanks for the tip anyway, that was a good one ;-)
>
> Glad to help.
>
> Doug
>
> --
>
>     This .signature sanitized for your protection
> _______________________________________________
> freebsd-stable at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
>