Doug Barton wrote:
> Marc Schneiders wrote:
> >
> > On Tue, 1 Feb 2000, Will Saxon wrote:
> >
> > > Well, apparently we are supposed to replace a bunch of files is /etc
> > > whenever we make world. There is a command called mergemaster that does
> > > this, but the one time i used it (I did not read the directionsvery
> > > carefully) I basically messed everything up.
> >
> > Yes, I don't like mergemaster either.
>
> Out of curiosity, what specifically do you not like about it? I realize
> that not everyone is going to like/use it, but I am always interested in
> ways to improve the program.
I don't know about everyone else, but my main beef with it is that it
doesn't use resources like cvs (when available) to do a smarter 3-way
merge. It's got the version ID tags available so it could use that to
extract the old unmodified version from cvs and use either rcsmerge or
applying a patch generated by a diff of the old unmodied version and the
current version.
This is easier said than done though as the etc files are scattered all
over the tree. :-/ However, when the path is available (ie: files with
$FreeBSD$ rather than $Id$) then there is no guessing required.
Cheers,
-Peter
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
