From owner-freebsd-questions@FreeBSD.ORG  Sun Nov 18 12:00:30 2007
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8723516A41B
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 12:00:30 +0000 (UTC)
	(envelope-from peter.schuller@infidyne.com)
Received: from smtp.infidyne.com (ds9.infidyne.com [88.80.6.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 429FD13C467
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 12:00:30 +0000 (UTC)
	(envelope-from peter.schuller@infidyne.com)
Received: from c-5416e555.03-51-73746f3.cust.bredbandsbolaget.se
	(c-5416e555.03-51-73746f3.cust.bredbandsbolaget.se [85.229.22.84])
	by smtp.infidyne.com (Postfix) with ESMTP id B17B7719C6;
	Sun, 18 Nov 2007 13:00:16 +0100 (CET)
From: Peter Schuller <peter.schuller@infidyne.com>
To: freebsd-questions@freebsd.org
Date: Sun, 18 Nov 2007 13:01:56 +0100
User-Agent: KMail/1.9.7
References: <200711171116.06705.peter.schuller@infidyne.com>
	<20071117140337.513fb3e3@gumby.homeunix.com.>
In-Reply-To: <20071117140337.513fb3e3@gumby.homeunix.com.>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart239170124.sgB9TK3S7U";
	protocol="application/pgp-signature"; micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200711181302.05161.peter.schuller@infidyne.com>
Cc: RW <fbsd06@mlists.homeunix.com>
Subject: Re: sysutils/etcmerge vs mergemaster
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Nov 2007 12:00:30 -0000

--nextPart239170124.sgB9TK3S7U
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

>  Isn't that what the -U option in mergemaster does?
>
>
>    -U       Attempt to auto upgrade files that have not been user
>                                                        modified.

I believe I tried this once and it did not make a difference, but I didn't=
=20
investigate. Perhaps I screwed up.

But even so, three-way merging is nice, so etcmerge remains interesting.

Thanks,

=2D-=20
/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller@infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey@scode.org
E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org


--nextPart239170124.sgB9TK3S7U
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)

iD8DBQBHQCm9DNor2+l1i30RAjcIAKDK32ldiBOCuLYG+M0wtPhYFGl1JwCgrLk2
67OL67VtNTu86kiaflgA5zQ=
=uMyZ
-----END PGP SIGNATURE-----

--nextPart239170124.sgB9TK3S7U--