Date: Mon, 20 Feb 1995 11:58:57 -0700 From: Nate Williams <nate@sneezy.sri.com> To: CVS-commiters@freefall.cdrom.com, cvs-gnu@freefall.cdrom.com Subject: Re: cvs commit: src/gnu/usr.bin/diff3 diff3.1 Message-ID: <199502201858.LAA15023@rocky.sri.MT.net> In-Reply-To: "Nate Williams" <nate@freefall.cdrom.com> "cvs commit: src/gnu/usr.bin/diff3 diff3.1" (Feb 20, 10:47)
next in thread | previous in thread | raw e-mail | index | archive | help
> 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. :-)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199502201858.LAA15023>