From owner-cvs-gnu Mon Feb 20 11:07:06 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id LAA02408 for cvs-gnu-outgoing; Mon, 20 Feb 1995 11:07:06 -0800 Received: from gndrsh.aac.dev.com (gndrsh.aac.dev.com [198.145.92.241]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id LAA02401; Mon, 20 Feb 1995 11:06:59 -0800 Received: (from rgrimes@localhost) by gndrsh.aac.dev.com (8.6.8/8.6.6) id LAA19769; Mon, 20 Feb 1995 11:06:17 -0800 From: "Rodney W. Grimes" Message-Id: <199502201906.LAA19769@gndrsh.aac.dev.com> Subject: Re: cvs commit: src/gnu/usr.bin/diff3 diff3.1 To: nate@freefall.cdrom.com (Nate Williams) Date: Mon, 20 Feb 1995 11:06:16 -0800 (PST) Cc: CVS-commiters@freefall.cdrom.com, cvs-gnu@freefall.cdrom.com In-Reply-To: <199502201847.KAA00993@freefall.cdrom.com> from "Nate Williams" at Feb 20, 95 10:47:20 am X-Mailer: ELM [version 2.4 PL23] Content-Type: text Content-Length: 1107 Sender: cvs-gnu-owner@freebsd.org Precedence: bulk > > nate 95/02/20 10:47:19 > > Modified: gnu/usr.bin/diff diff3.c > gnu/usr.bin/diff3 diff3.1 > Log: > Fixed non-conflict errors that occur when changes made to the local files are > the same as the changes made in the repository. This is often seen by > people with remote CVS trees that have applied their local patches to the > master site. a 'cvs update' will show bogus conflicts. > > Obtained from: CVS mailing list, Stig > > In diffutils 2.6 and 2.7, diff3 -A complains about identical overlapping > changes. They're different from the ancestor but not from each other... > Why bother? The patch below fixes this nonsense and preserves [B]ackwards > compatiblity with the -B flag (also --show-bogus-conflicts). > > Party on... > Stig THANK YOU! THANK YOU! THANK YOU! [For those not supping cvs this is really a big time saver after a commit for those that do!] -- Rod Grimes rgrimes@gndrsh.aac.dev.com Accurate Automation Company Custom computers for FreeBSD