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.
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" >
On Fri, Jul 3, 2009 at 10: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."From" -> "To" The new one is *always* the right one. -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/
On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey 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.The right hand side is always the new file. robert.> _______________________________________________ > 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"-- Robert Noland <rnoland@FreeBSD.org> FreeBSD -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 196 bytes Desc: This is a digitally signed message part Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20090703/a3e984eb/attachment.pgp
On Fri, 03.07.2009 at 10:51:08 +0200, Dominic Fandrey 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.When using X, maximize your xterm horizontally and use mergemaster -w100 or something like that. It will probe the tty again and offer the "real" width, so I usually just run mergemaster -w1 and hit enter. hth, Ulrich Sp?rlein