mergemaster annoyance or not?

Daniel O'Connor doconnor at gsoft.com.au
Fri Mar 13 02:01:34 PDT 2009


On Friday 13 March 2009 17:56:17 perryh at pluto.rain.com wrote:
> "Daniel O'Connor" <doconnor at 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20090313/800fa5de/attachment.pgp


More information about the freebsd-stable mailing list