Date: Fri, 3 Jul 2009 12:28:24 +0300 From: Dan Naumov <dan.naumov@gmail.com> To: Dominic Fandrey <kamikaze@bsdforen.de> Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster merge left/right Message-ID: <cf9b1ee00907030228w704acaf7u4925b17f73bb9a09@mail.gmail.com> In-Reply-To: <4A4DC67C.3010804@bsdforen.de> References: <4A4DC67C.3010804@bsdforen.de>
next in thread | previous in thread | raw e-mail | index | archive | help
Speaking of mergemaster, it would be really really nice to have "freebsd-update install" get the following functionality/options from mergemaster: -i Automatically install any files that do not exist in the destination directory. -F If the files differ only by VCS Id ($FreeBSD) install the new file. This would help avoid having to manually approve installation of hundreds of files in /etc when you upgrade to new releases using freebsd-update. - Sincerely, Dan Naumov On Fri, Jul 3, 2009 at 11:51 AM, Dominic Fandrey<kamikaze@bsdforen.de> wrote: > I'd really like mergemaster to tell me whether the left > or the right side is the new file. > > # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. > > Like this I have no idea which one to pick. > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cf9b1ee00907030228w704acaf7u4925b17f73bb9a09>