Date: Tue, 12 Nov 2002 23:56:09 -0800 From: Doug Barton <DougB@FreeBSD.org> To: Galen Sampson <galen_sampson@yahoo.com> Cc: current@FreeBSD.org Subject: Re: Mergemaster Bug (Though not a serious one) Message-ID: <3DD20599.E5383037@FreeBSD.org> References: <20021113015303.78222.qmail@web14104.mail.yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Galen Sampson wrote: > One thing that I found interesting during mergemaster was the grouping of > changes. For instance mergemaster determined that my /etc/group file was > lacking some groups. The 4 groups that needed changing were on adjacent lines. > Mergemaster gave me the option of merging all 4 changes at once as apposed to > merging the changes 1 line at a time. If you read the man page, you discover that mergemaster uses sdiff to handle this function, so the deltas are generated using (essentially) the standard diff algorithm for this purpose. There is no option to sdiff that displays diffs one line at a time. > IIRC the old mergemaster merged changes like this one line at a time. Nope. See above. > I know mergemaster has been changed since May (been rewritten to use sh > instead of perl). Be careful with what you know. :) There were two lines of perl in mergemaster, to deal with file/directory mode glom'ing. Everything else in it has always been Bourne shell. > I just thought I would let someone know in case this needs fixing for 5.0-release. Thank you for your interest in making FreeBSD better. Doug To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3DD20599.E5383037>