A smarter mergemaster

Daniel O'Connor doconnor at gsoft.com.au
Thu Sep 29 18:11:52 PDT 2005

On Friday 30 September 2005 08:15, Yar Tikhiy wrote:
> Feedback is welcome.  And please please don't skip making a backup of
> your /etc before running mergemaster!  I can't be responsible for its
> loss due to bugs in my code or whatever.

This work does look neat, but..
Try etcmerge :)
It's a bit of a pain to get started with it, but it is a *lot* faster (human 
input wise) than mergemaster. It only asks you about files that you have 
modified rather than ones that have been changed by committers (ie does a 3 
way merge).

It does have problems handling DB files, but that is usually not a big problem 
to fix.

Daniel O'Connor software and network engineer
for Genesis Software - http://www.gsoft.com.au
"The nice thing about standards is that there
are so many of them to choose from."
  -- Andrew Tanenbaum
GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20050930/7d8c54b7/attachment-0001.bin

More information about the freebsd-current mailing list