From owner-cvs-gnu Mon Feb 20 10:47:38 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA01009 for cvs-gnu-outgoing; Mon, 20 Feb 1995 10:47:38 -0800 Received: (from nate@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA00993; Mon, 20 Feb 1995 10:47:20 -0800 Date: Mon, 20 Feb 1995 10:47:20 -0800 From: Nate Williams Message-Id: <199502201847.KAA00993@freefall.cdrom.com> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff3 diff3.1 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 From owner-cvs-gnu Mon Feb 20 10:57:43 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA01643 for cvs-gnu-outgoing; Mon, 20 Feb 1995 10:57:43 -0800 Received: from rocky.sri.MT.net (sri.MT.net [204.94.231.129]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id KAA01630; Mon, 20 Feb 1995 10:57:37 -0800 Received: (from nate@localhost) by rocky.sri.MT.net (8.6.9/8.6.9) id LAA15023; Mon, 20 Feb 1995 11:58:57 -0700 Message-Id: <199502201858.LAA15023@rocky.sri.MT.net> From: Nate Williams Date: Mon, 20 Feb 1995 11:58:57 -0700 In-Reply-To: "Nate Williams" "cvs commit: src/gnu/usr.bin/diff3 diff3.1" (Feb 20, 10:47) Reply-To: Nate Williams X-Mailer: Mail User's Shell (7.2.5 10/14/92) To: CVS-commiters@freefall.cdrom.com, cvs-gnu@freefall.cdrom.com Subject: Re: cvs commit: src/gnu/usr.bin/diff3 diff3.1 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. Note: I verified that this does indeed work in our setup exactly by doing a quick sup update of the gnu tree and then making sure that these changes I had committed to diff on my machine didn't show up as conflicts. It had worked perfectly in all my contrived tests, but a real world example is always much better. :-) 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 From owner-cvs-gnu Wed Feb 22 21:48:45 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id VAA23309 for cvs-gnu-outgoing; Wed, 22 Feb 1995 21:48:45 -0800 Received: (from phk@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id VAA23299; Wed, 22 Feb 1995 21:48:39 -0800 Date: Wed, 22 Feb 1995 21:48:39 -0800 From: Poul-Henning Kamp Message-Id: <199502230548.VAA23299@freefall.cdrom.com> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/ngroff Makefile.cfg Sender: cvs-gnu-owner@freebsd.org Precedence: bulk phk 95/02/22 21:48:38 Modified: gnu/usr.bin/ngroff Makefile.cfg Log: Don't rely on execute bit. From owner-cvs-gnu Thu Feb 23 14:37:05 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id OAA17096 for cvs-gnu-outgoing; Thu, 23 Feb 1995 14:37:05 -0800 Received: (from ache@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id OAA17084; Thu, 23 Feb 1995 14:36:59 -0800 Date: Thu, 23 Feb 1995 14:36:59 -0800 From: "Andrew A. Chernov" Message-Id: <199502232236.OAA17084@freefall.cdrom.com> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/lib/libdialog help.c msgbox.c notify.c Sender: cvs-gnu-owner@freebsd.org Precedence: bulk ache 95/02/23 14:36:58 Modified: gnu/lib/libdialog help.c msgbox.c notify.c Log: Simplify notify() Fix dupwin usage, now it really restore screen Disable helpline while helpfile displayed Fix helpfile borders Fix mesgbox range computing From owner-cvs-gnu Thu Feb 23 14:42:55 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id OAA17313 for cvs-gnu-outgoing; Thu, 23 Feb 1995 14:42:55 -0800 Received: (from ache@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id OAA17303; Thu, 23 Feb 1995 14:42:49 -0800 Date: Thu, 23 Feb 1995 14:42:49 -0800 From: "Andrew A. Chernov" Message-Id: <199502232242.OAA17303@freefall.cdrom.com> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/dialog/TESTS menubox yesno Sender: cvs-gnu-owner@freebsd.org Precedence: bulk ache 95/02/23 14:42:47 Modified: gnu/usr.bin/dialog dialog.1 dialog.c gnu/usr.bin/dialog/TESTS menubox yesno Log: Implement --hline "line" and --hfile file From owner-cvs-gnu Fri Feb 24 03:22:21 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id DAA13867 for cvs-gnu-outgoing; Fri, 24 Feb 1995 03:22:21 -0800 Received: from time.cdrom.com (time.cdrom.com [192.216.223.46]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id DAA13845; Fri, 24 Feb 1995 03:22:08 -0800 Received: (from root@localhost) by time.cdrom.com (8.6.9/8.6.9) id DAA10872; Fri, 24 Feb 1995 03:21:37 -0800 Date: Fri, 24 Feb 1995 03:21:37 -0800 From: "Jordan K. Hubbard" Message-Id: <199502241121.DAA10872@time.cdrom.com> To: CVS-commiters@time.cdrom.com, cvs-gnu@time.cdrom.com Subject: cvs commit: src/gnu/usr.bin/dialog dialog.1 Sender: cvs-gnu-owner@freebsd.org Precedence: bulk jkh 95/02/24 03:21:36 Modified: gnu/usr.bin/dialog dialog.1 Log: Correct a few typos. From owner-cvs-gnu Sat Feb 25 19:03:22 1995 Return-Path: cvs-gnu-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id TAA21906 for cvs-gnu-outgoing; Sat, 25 Feb 1995 19:03:22 -0800 Received: (from bde@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id TAA21892; Sat, 25 Feb 1995 19:03:18 -0800 Date: Sat, 25 Feb 1995 19:03:18 -0800 From: Bruce Evans Message-Id: <199502260303.TAA21892@freefall.cdrom.com> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/man/manpath Makefile Sender: cvs-gnu-owner@freebsd.org Precedence: bulk bde 95/02/25 19:03:17 Modified: gnu/usr.bin/man/manpath Makefile Log: Install manpath.config.sample with the correct mode. It should be installed elsewhere.