Date: Fri, 13 Mar 2009 00:26:17 -0700 From: perryh@pluto.rain.com To: doconnor@gsoft.com.au Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster annoyance or not? Message-ID: <49ba0a99.zRpbA1XAX3ZA0YOG%perryh@pluto.rain.com> In-Reply-To: <200903131054.40000.doconnor@gsoft.com.au> References: <200903121505.n2CF5RXx047734@lurza.secnetix.de> <200903131054.40000.doconnor@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
"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? * 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49ba0a99.zRpbA1XAX3ZA0YOG%perryh>