Re: A smarter mergemaster

• Previous message: Yar Tikhiy: "A smarter mergemaster"
• In reply to: Yar Tikhiy: "A smarter mergemaster"
• Next in thread: Ashley Moran: "Re: A smarter mergemaster"
• Reply: Ashley Moran: "Re: A smarter mergemaster"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

To: freebsd-current@freebsd.org
Date: Fri, 30 Sep 2005 10:41:09 +0930

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

• application/pgp-signature attachment: stored

• Previous message: Yar Tikhiy: "A smarter mergemaster"
• In reply to: Yar Tikhiy: "A smarter mergemaster"
• Next in thread: Ashley Moran: "Re: A smarter mergemaster"
• Reply: Ashley Moran: "Re: A smarter mergemaster"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]