[Looks right at least on first glance. Needs sanity.sh test case (probably better to modify an existing one, which includes diff3, rather than increase the size of the testsuite for this). -kingdon] Return-Path: X-Authentication-Warning: harvey.cyclic.com: majordomo set sender to owner-bug-cvs-list@harvey.cyclic.com using -f Date: Sat, 24 Apr 1999 00:13:34 -0500 From: Mike Castle To: bug-cvs@gnu.org Subject: Names that begin with '-' Reply-To: Mike Castle Content-Type: text/plain; charset=us-ascii Sender: owner-bug-cvs-list@cyclic.com Precedence: bulk There have been problems with files beginning with '-'. cvs diff and commit and merges fail. Since we now know we will be using gnu diff, we can use -- to indicate that no further options will appear. Index: src/rcscmds.c =================================================================== RCS file: /home2/cvsroot/ccvs/src/rcscmds.c,v retrieving revision 1.49 diff -u -r1.49 rcscmds.c --- rcscmds.c 1998/08/15 20:47:46 1.49 +++ rcscmds.c 1999/04/24 05:04:30 @@ -308,6 +308,8 @@ call_diff_arg ("-L"); call_diff_arg (xrev2); + call_diff_arg ("--"); + call_diff_arg (workfile); call_diff_arg (tmp1); call_diff_arg (tmp2); @@ -575,6 +577,9 @@ /* The first word in this string is used only for error reporting. */ sprintf (args, "diff %s", options); call_diff_setup (args); + + call_diff_arg ("--"); + call_diff_arg (file1); call_diff_arg (file2); free (args); @@ -624,6 +629,9 @@ call_diff_arg (label1); if (label2) call_diff_arg (label2); + + call_diff_arg ("--"); + call_diff_arg (file1); call_diff_arg (file2); free (args); -- Mike Castle Life is like a clock: You can work constantly dalgoda@ix.netcom.com and be right all the time, or not work at all www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc We are all of us living in the shadow of Manhattan. -- Watchmen