[ On Wednesday, May 28, 2003 at 15:24:09 (-0700), Jim wrote: ]
> Subject: Re: The idea isn't clear...
>
> >>>>>>>
> stuff
> =======
> other stuff
> <<<<<<<
>
> though I'm not sure whether the top or the bottom is more recent... it's
> ususally easy to tell which is the correct one...
It's one hell of a lot easier to tell what's going on with conflicts if
you fix CVS to call "diff3" in such a way that it includes the full
conflict information:
$ cvs diff rcscmds.c
Index: rcscmds.c
===================================================================
RCS file: /home2/cvsroot/ccvs/src/rcscmds.c,v
retrieving revision 1.50
diff -c -r1.50 rcscmds.c
*** rcscmds.c 14 Feb 2001 04:31:27 -0000 1.50
--- rcscmds.c 28 May 2003 23:27:09 -0000
***************
*** 245,254 ****
--- 245,258 ----
char *tmp1, *tmp2;
char *diffout = NULL;
int retval;
+ struct stat file_info;
if (options != NULL && options[0] != '\0')
assert (options[0] == '-' && options[1] == 'k');
+ if (CVS_STAT (workfile, &file_info) < 0)
+ error (1, errno, "could not stat %s", workfile);
+
cvs_output ("RCS file: ", 0);
cvs_output (rcs->path, 0);
cvs_output ("\n", 1);
***************
*** 298,305 ****
only for diagnostic messages -- CVS no longer forks to run diff3. */
diffout = cvs_temp_name();
call_diff_setup ("diff3");
! call_diff_arg ("-E");
! call_diff_arg ("-am");
call_diff_arg ("-L");
call_diff_arg (workfile);
--- 302,308 ----
only for diagnostic messages -- CVS no longer forks to run diff3. */
diffout = cvs_temp_name();
call_diff_setup ("diff3");
! call_diff_arg ("-ATam");
call_diff_arg ("-L");
call_diff_arg (workfile);
This should have been changed years ago.....
--
Greg A. Woods
+1 416 218-0098; <[EMAIL PROTECTED]>; <[EMAIL PROTECTED]>
Planix, Inc. <[EMAIL PROTECTED]>; VE3TCP; Secrets of the Weird <[EMAIL PROTECTED]>
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
