Submitter-Id: net
Originator: Paul Edwards
Confidential: no
Synopsis: failure to do a join when only 2 versions
Severity: serious
Priority: high
Category: cvs
Class: sw-bug
Release: cvs-1.11
Environment:
<machine, os, target, libraries (multiple lines)>
System: SunOS ecs1syd2 5.8 Generic_108528-15 sun4u sparc
SUNW,Ultra-Enterprise
Architecture: sun4Description: If you run the "doit" script in attached zip file, you will find that despite the fact that there is no 3-way diff required, since there are only 2 versions of the file to contend with, cvs fails to do the merge, and in fact, even comes up and manages to flag some arbitrary code as "conflicts" doing the "merge". How-To-Repeat: run doit. Fix: Update to the latest version of the file, copy it aside, go back, do the merge again, copy the saved copy over the conflict version. replace "w3.to" with "bigpond.net.au" to get a more reliable reply address for kerravon BFN. Paul.
cvsbug1.zip
Description: Zip compressed data
_______________________________________________ Bug-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-cvs
