Date: Fri, 30 Sep 2005 10:41:09 +0930 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-current@freebsd.org Cc: Yar Tikhiy <yar@comp.chem.msu.su>, hackers@freebsd.org, current@freebsd.org Subject: Re: A smarter mergemaster Message-ID: <200509301041.10480.doconnor@gsoft.com.au> In-Reply-To: <20050929224548.GB3035@comp.chem.msu.su> References: <20050929224548.GB3035@comp.chem.msu.su>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iD8DBQBDPJCu5ZPcIHs/zowRAonsAKClO/GZv+6Mm0Y542IHl/x9m/Y4JgCeKIdo 8rpLcz3uZ704OXNvs66ykMs= =nv9V -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509301041.10480.doconnor>