From owner-freebsd-questions@FreeBSD.ORG Sun Sep 7 03:22:32 2008 Return-Path: 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 2C8CA1065673 for ; Sun, 7 Sep 2008 03:22:32 +0000 (UTC) (envelope-from mapsware@prodigy.net.mx) Received: from nlpiport17.prodigy.net.mx (nlpiport17.prodigy.net.mx [148.235.52.22]) by mx1.freebsd.org (Postfix) with ESMTP id EBCD48FC19 for ; Sun, 7 Sep 2008 03:22:31 +0000 (UTC) (envelope-from mapsware@prodigy.net.mx) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AoI9AHvlwki9pTgMPGdsb2JhbACBZYZ9iVUBAQEBLQGfZIFm X-IronPort-AV: E=Sophos;i="4.32,349,1217826000"; d="scan'208";a="127159884" Received: from nlpiport02.prodigy.net.mx ([148.235.52.117]) by nlpiport17.prodigy.net.mx with ESMTP; 06 Sep 2008 22:22:27 -0500 Received: from dsl-189-165-56-12.prod-infinitum.com.mx (HELO morena.maps.mx) ([189.165.56.12]) by nlpiport02.prodigy.net.mx with ESMTP; 06 Sep 2008 22:22:27 -0500 From: Martin Alejandro Paredes Sanchez To: freebsd-questions@freebsd.org Date: Sat, 6 Sep 2008 20:22:29 -0700 User-Agent: KMail/1.9.10 References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200809062022.29963.mapsware@prodigy.net.mx> Subject: Re: alternatives to mergemaster X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2008 03:22:32 -0000 El S=E1b 06 Sep 2008, Christian Laursen escribi=F3: > "Michael P. Soulier" writes: > > The downside of mergemaster is that it is only a 2-way merge, where a > > 3-way would know better than you prompt you for changes that you > > didn't make. This makes mergemaster far more tedious than it has to > > be. Has anyone considered a good 3-way merge tool? > > I always run mergemaster in auto upgrade mode. From the man page: > > -U Attempt to auto upgrade files that have not been user modi- > fied. > > This can also be achieved by putting "AUTO_UPGRADE=3Dyes" in > /etc/mergemaster.rc. > > Combined with auto install, mergemaster requires little effort. I also recommend the "-i" option -i Automatically install any files that do not exist in the destination directory. The option -U depends on the existence of a database=20 (/var/db/mergemaster.mtree), witch does not exist the first time. So the=20 first time you run the mergemaster, you can not use the "-U" option. But, my advice is, when you install FreeBSD in a computer, run mergemaster= =20 before you upgrade the source code to build the database. maps