Date: Sat, 6 Sep 2008 20:22:29 -0700 From: Martin Alejandro Paredes Sanchez <mapsware@prodigy.net.mx> To: freebsd-questions@freebsd.org Subject: Re: alternatives to mergemaster Message-ID: <200809062022.29963.mapsware@prodigy.net.mx> In-Reply-To: <ygf1vzx2l2g.fsf@dominion.borderworlds.dk> References: <fb6605670809061028s680b3fffk9f435f8a150eb99d@mail.gmail.com> <ygf1vzx2l2g.fsf@dominion.borderworlds.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
El S=E1b 06 Sep 2008, Christian Laursen escribi=F3:
> "Michael P. Soulier" <msoulier@digitaltorque.ca> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809062022.29963.mapsware>