Date: Fri, 13 Mar 2009 19:31:28 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: perryh@pluto.rain.com Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster annoyance or not? Message-ID: <200903131931.28854.doconnor@gsoft.com.au> In-Reply-To: <49ba0a99.zRpbA1XAX3ZA0YOG%perryh@pluto.rain.com> References: <200903121505.n2CF5RXx047734@lurza.secnetix.de> <200903131054.40000.doconnor@gsoft.com.au> <49ba0a99.zRpbA1XAX3ZA0YOG%perryh@pluto.rain.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Friday 13 March 2009 17:56:17 perryh@pluto.rain.com wrote: > "Daniel O'Connor" <doconnor@gsoft.com.au> wrote: > > I wonder how hard it would be to add 3 way merging (like > > sysutils/etcmerge) to mergemaster.. > > One complication: to do a 3-way merge you have to have the common > ancestor. To ensure the initial availability of such would require > some infrastructure which AFAIK does not currently exist: > > * A standardized place to keep the original contents of /etc -- > /origEtc or /etc-<versionId> anyone? etcmerge keeps it in /var/db/etc > * A way to ensure that installation populates that place with > the needed redundant copy of the bits, either by including the > additional instance within the distributions or by generating > it in the course of installation. The former would likely be > easier, if only because the latter would need to work for all > installation methods. IMO it is OK to fall back to a 2 way diff if it doesn't exist (ie the first time you run it) -- 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.9 (GNU/Linux) iD8DBQBJuiDo5ZPcIHs/zowRAtq1AJ9+ArynZrzBsiV0BnzMbdgZxYdijgCfeYss 1yssin2Plc0FrDRhR7ZrG9o= =bu9+ -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903131931.28854.doconnor>