From owner-freebsd-current Tue Nov 12 23:56:12 2002 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 555A137B401 for ; Tue, 12 Nov 2002 23:56:11 -0800 (PST) Received: from 12-234-90-219.client.attbi.com (12-234-90-219.client.attbi.com [12.234.90.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65EB943E42 for ; Tue, 12 Nov 2002 23:56:10 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from FreeBSD.org (master.gorean.org [10.0.0.2]) by 12-234-90-219.client.attbi.com (8.12.6/8.12.6) with ESMTP id gAD7u9b1065608; Tue, 12 Nov 2002 23:56:09 -0800 (PST) (envelope-from DougB@FreeBSD.org) Message-ID: <3DD20599.E5383037@FreeBSD.org> Date: Tue, 12 Nov 2002 23:56:09 -0800 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.8 [en] (X11; U; FreeBSD 4.7-RELEASE i386) X-Accept-Language: en MIME-Version: 1.0 To: Galen Sampson Cc: current@FreeBSD.org Subject: Re: Mergemaster Bug (Though not a serious one) References: <20021113015303.78222.qmail@web14104.mail.yahoo.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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