[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog diff.c rcs.h rcscmds.c sanit... [signed-com
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs/src ChangeLog diff.c rcs.h rcscmds.c sanit... [signed-commits3] |
|
Date: |
Thu, 19 Jan 2006 19:39:41 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: signed-commits3
Changes by: Derek Robert Price <address@hidden> 06/01/19 19:39:41
Modified files:
src : ChangeLog diff.c rcs.h rcscmds.c sanity.sh
Log message:
* diff.c (enum diff_file): Add DIFF_CLIENT.
(diff): Send no content when possible.
(diff_fileproc): Consolidate complex handling into a single call to
diff_exec.
(diff_file_nodiff): Punt when only the client knows if there are true
differences.
* rcs.h (RCS_output_diff_options): Add prototype.
* rcscmds.c (RCS_exec_rcsdiff): Remove this unused function.
(RCS_output_diff_options): Handle add & remove cases.
* sanity.sh: Accomodate the above changes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits3&tr1=1.3328.2.37&tr2=1.3328.2.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/diff.c.diff?only_with_tag=signed-commits3&tr1=1.116.6.4&tr2=1.116.6.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.h.diff?only_with_tag=signed-commits3&tr1=1.82.8.5&tr2=1.82.8.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcscmds.c.diff?only_with_tag=signed-commits3&tr1=1.72.6.1&tr2=1.72.6.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=signed-commits3&tr1=1.1105.2.16&tr2=1.1105.2.17&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3328.2.37 ccvs/src/ChangeLog:1.3328.2.38
--- ccvs/src/ChangeLog:1.3328.2.37 Wed Jan 18 15:59:05 2006
+++ ccvs/src/ChangeLog Thu Jan 19 19:39:40 2006
@@ -1,3 +1,17 @@
+2006-01-19 Derek Price <address@hidden>
+
+ * diff.c (enum diff_file): Add DIFF_CLIENT.
+ (diff): Send no content when possible.
+ (diff_fileproc): Consolidate complex handling into a single call to
+ diff_exec.
+ (diff_file_nodiff): Punt when only the client knows if there are true
+ differences.
+ * rcs.h (RCS_output_diff_options): Add prototype.
+ * rcscmds.c (RCS_exec_rcsdiff): Remove this unused function.
+ (RCS_output_diff_options): Handle add & remove cases.
+
+ * sanity.sh: Accomodate the above changes.
+
2006-01-18 Derek Price <address@hidden>
* sanity.sh: Create $HOME/.gnupg to work around a problem with at least
Index: ccvs/src/diff.c
diff -u ccvs/src/diff.c:1.116.6.4 ccvs/src/diff.c:1.116.6.5
--- ccvs/src/diff.c:1.116.6.4 Tue Jan 10 18:42:38 2006
+++ ccvs/src/diff.c Thu Jan 19 19:39:40 2006
@@ -24,7 +24,9 @@
#endif
/* CVS headers. */
+#include "base.h"
#include "ignore.h"
+#include "rcs.h"
#include "recurse.h"
#include "wrapper.h"
@@ -35,6 +37,7 @@
enum diff_file
{
DIFF_ERROR,
+ DIFF_CLIENT,
DIFF_ADDED,
DIFF_REMOVED,
DIFF_DIFFERENT,
@@ -416,7 +419,10 @@
options = xstrdup ("");
#ifdef CLIENT_SUPPORT
- if (current_parsed_root->isremote) {
+ if (current_parsed_root->isremote)
+ {
+ int flags;
+
/* We're the client side. Fire up the remote server. */
start_server ();
@@ -440,8 +446,12 @@
send_arg ("--");
/* Send the current files unless diffing two revs from the archive */
- send_files (argc, argv, local, 0,
- (diff_rev2 || diff_date2) ? SEND_NO_CONTENTS : 0);
+ flags = 0;
+ if ((!suppress_bases && supported_request ("Base-diff"))
+ || diff_rev2 || diff_date2)
+ flags |= SEND_NO_CONTENTS;
+
+ send_files (argc, argv, local, 0, flags);
send_file_names (argc, argv, SEND_EXPAND_WILD);
@@ -492,13 +502,15 @@
{
int status, err = 2; /* 2 == trouble, like rcsdiff */
Vers_TS *vers;
- enum diff_file empty_file = DIFF_DIFFERENT;
+ enum diff_file empty_file = server_use_bases ()
+ ? DIFF_CLIENT : DIFF_DIFFERENT;
char *tmp = NULL;
char *tocvsPath = NULL;
char *fname = NULL;
char *label1;
char *label2;
char *rev1_cache = NULL;
+ const char *f1 = NULL, *f2 = NULL;
user_file_rev = 0;
vers = Version_TS (finfo, NULL, NULL, NULL, 1, 0);
@@ -648,6 +660,7 @@
}
}
+
empty_file = diff_file_nodiff (finfo, vers, empty_file, &rev1_cache);
if (empty_file == DIFF_SAME)
{
@@ -669,17 +682,21 @@
cvs_output (finfo->fullname, 0);
cvs_output ("\n", 1);
- tocvsPath = wrap_tocvs_process_file (finfo->file);
- if (tocvsPath)
+ if (!server_use_bases ())
{
- /* Backup the current version of the file to CVS/,,filename */
- fname = Xasprintf (fname, "%s/%s%s", CVSADM, CVSPREFIX, finfo->file);
- if (unlink_file_dir (fname) < 0)
- if (!existence_error (errno))
- error (1, errno, "cannot remove %s", fname);
- rename_file (finfo->file, fname);
- /* Copy the wrapped file to the current directory then go to work */
- copy_file (tocvsPath, finfo->file);
+ tocvsPath = wrap_tocvs_process_file (finfo->file);
+ if (tocvsPath)
+ {
+ /* Backup the current version of the file to CVS/,,filename */
+ fname = Xasprintf (fname, "%s/%s%s", CVSADM, CVSPREFIX,
+ finfo->file);
+ if (unlink_file_dir (fname) < 0)
+ if (!existence_error (errno))
+ error (1, errno, "cannot remove %s", fname);
+ rename_file (finfo->file, fname);
+ /* Copy the wrapped file to the current directory then go to work */
+ copy_file (tocvsPath, finfo->file);
+ }
}
/* Set up file labels appropriate for compatibility with the Larry Wall
@@ -708,66 +725,57 @@
}
}
- if (empty_file == DIFF_ADDED || empty_file == DIFF_REMOVED)
+ /* Print a header for each file. */
+ cvs_output (
+"===================================================================\n",
+ 0);
+ if (finfo->rcs)
{
- /* This is fullname, not file, possibly despite the POSIX.2
- * specification, because that's the way all the Larry Wall
- * implementations of patch (are there other implementations?) want
- * things and the POSIX.2 spec appears to leave room for this.
- */
- cvs_output ("\
-===================================================================\n\
-RCS file: ", 0);
+ cvs_output ("RCS file: ", 0);
+ cvs_output (finfo->rcs->print_path, 0);
+ }
+ else
+ {
+ cvs_output ("File: ", 0);
cvs_output (finfo->fullname, 0);
- cvs_output ("\n", 1);
+ }
+ cvs_output ("\n", 1);
- cvs_output ("diff -N ", 0);
- cvs_output (finfo->fullname, 0);
+ if (empty_file == DIFF_ADDED)
+ f1 = DEVNULL;
+ else
+ {
+ cvs_output ("retrieving revision ", 0);
+ cvs_output (use_rev1, 0);
cvs_output ("\n", 1);
+ f1 = temp_checkout (vers->srcfile, finfo, vers->vn_user, use_rev1,
+ vers->tag,
+ diff_rev1 && !isdigit (diff_rev1[0])
+ ? diff_rev1 : vers->tag,
+ vers->options, *options ? options : vers->options);
+ }
- if (empty_file == DIFF_ADDED)
- {
- if (use_rev2 == NULL)
- status = diff_exec (DEVNULL, finfo->file, label1, label2,
- diff_argc, diff_argv, RUN_TTY);
- else
- {
- int retcode;
-
- tmp = cvs_temp_name ();
- retcode = RCS_checkout (vers->srcfile, NULL, use_rev2, NULL,
- *options ? options : vers->options,
- tmp, NULL, NULL);
- if (retcode != 0)
- goto out;
-
- status = diff_exec (DEVNULL, tmp, label1, label2,
- diff_argc, diff_argv, RUN_TTY);
- }
- }
- else
- {
- int retcode;
-
- tmp = cvs_temp_name ();
- retcode = RCS_checkout (vers->srcfile, NULL, use_rev1, NULL,
- *options ? options : vers->options,
- tmp, NULL, NULL);
- if (retcode != 0)
- goto out;
-
- status = diff_exec (tmp, DEVNULL, label1, label2,
- diff_argc, diff_argv, RUN_TTY);
- }
+ if (empty_file == DIFF_REMOVED)
+ f2 = DEVNULL;
+ else if (use_rev2)
+ {
+ cvs_output ("retrieving revision ", 0);
+ cvs_output (use_rev2, 0);
+ cvs_output ("\n", 1);
+ f2 = temp_checkout (vers->srcfile, finfo, vers->vn_user, use_rev2,
+ vers->tag,
+ diff_rev2 && !isdigit (diff_rev2[0])
+ ? diff_rev2 : NULL,
+ vers->options, *options ? options : vers->options);
}
else
- {
- status = RCS_exec_rcsdiff (vers->srcfile, diff_argc, diff_argv,
- *options ? options : vers->options,
- use_rev1, rev1_cache, use_rev2,
- label1, label2, finfo->file);
+ f2 = finfo->file;
- }
+ RCS_output_diff_options (diff_argc, diff_argv, empty_files,
+ use_rev1, use_rev2, finfo->file);
+
+ status = diff_exec (f1, f2, label1, label2,
+ diff_argc, diff_argv, RUN_TTY);
if (label1) free (label1);
if (label2) free (label2);
@@ -786,10 +794,10 @@
}
out:
- if( tocvsPath != NULL )
+ if (tocvsPath != NULL)
{
if (unlink_file_dir (finfo->file) < 0)
- if (! existence_error (errno))
+ if (!existence_error (errno))
error (1, errno, "cannot remove %s", finfo->file);
rename_file (fname, finfo->file);
@@ -798,16 +806,29 @@
free (fname);
}
+ if (empty_file != DIFF_ADDED && f1)
+ {
+ if (CVS_UNLINK (f1) < 0)
+ error (0, errno, "Failed to remove temp file `%s'", f1);
+ free ((char *)f1);
+ }
+ if (empty_file == DIFF_REMOVED && use_rev2 && f2)
+ {
+ if (CVS_UNLINK (f2) < 0)
+ error (0, errno, "Failed to remove temp file `%s'", f2);
+ free ((char *)f2);
+ }
+
/* Call CVS_UNLINK() rather than unlink_file() below to avoid the check
* for noexec.
*/
- if (tmp != NULL)
+ if (tmp)
{
if (CVS_UNLINK (tmp) < 0)
error (0, errno, "cannot remove %s", tmp);
free (tmp);
}
- if (rev1_cache != NULL)
+ if (rev1_cache)
{
if (CVS_UNLINK (rev1_cache) < 0)
error (0, errno, "cannot remove %s", rev1_cache);
@@ -1103,7 +1124,7 @@
|| ( vers->vn_user != NULL
&& strcmp( use_rev1, vers->vn_user ) == 0 ) )
{
- if (empty_file == DIFF_DIFFERENT
+ if ((empty_file == DIFF_DIFFERENT || empty_file == DIFF_CLIENT)
&& vers->ts_user != NULL
&& strcmp (vers->ts_rcs, vers->ts_user) == 0
&& (!(*options) || strcmp (options, vers->options) == 0))
Index: ccvs/src/rcs.h
diff -u ccvs/src/rcs.h:1.82.8.5 ccvs/src/rcs.h:1.82.8.6
--- ccvs/src/rcs.h:1.82.8.5 Mon Jan 16 21:02:06 2006
+++ ccvs/src/rcs.h Thu Jan 19 19:39:40 2006
@@ -315,5 +315,8 @@
FILE *, bool);
void free_keywords (void *keywords);
bool contains_keyword (char *buf, size_t len);
+void RCS_output_diff_options (int diff_argc, char * const *diff_argv,
+ bool devnull, const char *rev1, const char *rev2,
+ const char *workfile);
#endif /* RCS_H */
Index: ccvs/src/rcscmds.c
diff -u ccvs/src/rcscmds.c:1.72.6.1 ccvs/src/rcscmds.c:1.72.6.2
--- ccvs/src/rcscmds.c:1.72.6.1 Wed Dec 21 13:25:10 2005
+++ ccvs/src/rcscmds.c Thu Jan 19 19:39:40 2006
@@ -65,8 +65,6 @@
On a related note, see the comments at diff_exec, later in this file,
for more on the diff library. */
-static void RCS_output_diff_options (int, char * const *, const char *,
- const char *, const char *);
/* Stuff to deal with passing arguments the way libdiff.a wants to deal
@@ -75,150 +73,6 @@
log_data" in log.c. */
-
-/* Diff revisions and/or files. OPTS controls the format of the diff
- (it contains options such as "-w -c", &c), or "" for the default.
- OPTIONS controls keyword expansion, as a string starting with "-k",
- or "" to use the default. REV1 is the first revision to compare
- against; it must be non-NULL. If REV2 is non-NULL, compare REV1
- and REV2; if REV2 is NULL compare REV1 with the file in the working
- directory, whose name is WORKFILE. LABEL1 and LABEL2 are default
- file labels, and (if non-NULL) should be added as -L options
- to diff. Output goes to stdout.
-
- Return value is 0 for success, -1 for a failure which set errno,
- or positive for a failure which printed a message on stderr.
-
- This used to exec rcsdiff, but now calls RCS_checkout and diff_exec.
-
- An issue is what timezone is used for the dates which appear in the
- diff output. rcsdiff uses the -z flag, which is not presently
- processed by CVS diff, but I'm not sure exactly how hard to worry
- about this--any such features are undocumented in the context of
- CVS, and I'm not sure how important to users. */
-int
-RCS_exec_rcsdiff (RCSNode *rcsfile, int diff_argc,
- char * const *diff_argv, const char *options,
- const char *rev1, const char *rev1_cache, const char *rev2,
- const char *label1, const char *label2, const char *workfile)
-{
- char *tmpfile1 = NULL;
- char *tmpfile2 = NULL;
- const char *use_file1, *use_file2;
- int status, retval;
-
-
- cvs_output ("\
-===================================================================\n\
-RCS file: ", 0);
- cvs_output (rcsfile->print_path, 0);
- cvs_output ("\n", 1);
-
- /* Historically, `cvs diff' has expanded the $Name keyword to the
- empty string when checking out revisions. This is an accident,
- but no one has considered the issue thoroughly enough to determine
- what the best behavior is. Passing NULL for the `nametag' argument
- preserves the existing behavior. */
-
- cvs_output ("retrieving revision ", 0);
- cvs_output (rev1, 0);
- cvs_output ("\n", 1);
-
- if (rev1_cache != NULL)
- use_file1 = rev1_cache;
- else
- {
- tmpfile1 = cvs_temp_name();
- status = RCS_checkout (rcsfile, NULL, rev1, NULL, options, tmpfile1,
- NULL, NULL);
- if (status > 0)
- {
- retval = status;
- goto error_return;
- }
- else if (status < 0)
- {
- error( 0, errno,
- "cannot check out revision %s of %s", rev1, rcsfile->path );
- retval = 1;
- goto error_return;
- }
- use_file1 = tmpfile1;
- }
-
- if (rev2 == NULL)
- {
- assert (workfile != NULL);
- use_file2 = workfile;
- }
- else
- {
- tmpfile2 = cvs_temp_name ();
- cvs_output ("retrieving revision ", 0);
- cvs_output (rev2, 0);
- cvs_output ("\n", 1);
- status = RCS_checkout (rcsfile, NULL, rev2, NULL, options,
- tmpfile2, NULL, NULL);
- if (status > 0)
- {
- retval = status;
- goto error_return;
- }
- else if (status < 0)
- {
- error (0, errno,
- "cannot check out revision %s of %s", rev2, rcsfile->path);
- return 1;
- }
- use_file2 = tmpfile2;
- }
-
- RCS_output_diff_options (diff_argc, diff_argv, rev1, rev2, workfile);
- status = diff_exec (use_file1, use_file2, label1, label2,
- diff_argc, diff_argv, RUN_TTY);
- if (status >= 0)
- {
- retval = status;
- goto error_return;
- }
- else if (status < 0)
- {
- error (0, errno,
- "cannot diff %s and %s", use_file1, use_file2);
- retval = 1;
- goto error_return;
- }
-
- error_return:
- {
- /* Call CVS_UNLINK() below rather than unlink_file to avoid the check
- * for noexec.
- */
- if( tmpfile1 != NULL )
- {
- if( CVS_UNLINK( tmpfile1 ) < 0 )
- {
- if( !existence_error( errno ) )
- error( 0, errno, "cannot remove temp file %s", tmpfile1 );
- }
- free( tmpfile1 );
- }
- if( tmpfile2 != NULL )
- {
- if( CVS_UNLINK( tmpfile2 ) < 0 )
- {
- if( !existence_error( errno ) )
- error( 0, errno, "cannot remove temp file %s", tmpfile2 );
- }
- free (tmpfile2);
- }
- }
-
- return retval;
-}
-
-
-
/* Show differences between two files. This is the start of a diff library.
Some issues:
@@ -313,9 +167,9 @@
which not to print. The code below reproduces every rcsdiff run
that I have seen. */
-static void
+void
RCS_output_diff_options (int diff_argc, char * const *diff_argv,
- const char *rev1, const char *rev2,
+ bool devnull, const char *rev1, const char *rev2,
const char *workfile)
{
int i;
@@ -326,19 +180,28 @@
cvs_output (" ", 1);
cvs_output (quotearg_style (shell_quoting_style, diff_argv[i]), 0);
}
- cvs_output (" -r", 3);
- cvs_output (rev1, 0);
+
+ if (devnull)
+ cvs_output (" -N", 3);
+
+ if (rev1)
+ {
+ cvs_output (" -r", 3);
+ cvs_output (rev1, 0);
+ }
if (rev2)
{
cvs_output (" -r", 3);
cvs_output (rev2, 0);
}
- else
+
+ if (!rev1 || !rev2)
{
- assert (workfile != NULL);
+ assert (workfile);
cvs_output (" ", 1);
cvs_output (workfile, 0);
}
+
cvs_output ("\n", 1);
}
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1105.2.16 ccvs/src/sanity.sh:1.1105.2.17
--- ccvs/src/sanity.sh:1.1105.2.16 Wed Jan 18 15:59:05 2006
+++ ccvs/src/sanity.sh Thu Jan 19 19:39:40 2006
@@ -6439,8 +6439,9 @@
dotest_fail death2-diff-2 "${testcvs} -q diff -N -c file1" \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+diff -c -N -r1\.1 file1
\*\*\* file1 ${RFCDATE} [0-9.]*
--- /dev/null ${RFCDATE_EPOCH}
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6467,8 +6468,9 @@
"${testcvs} -q diff -r1.1 -rbranch -N -c file1" \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+diff -c -N -r1\.1 -r1\.1\.2\.1
\*\*\* file1 ${RFCDATE} [0-9.]*
--- /dev/null ${RFCDATE_EPOCH}
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6480,8 +6482,9 @@
"${testcvs} -q diff -rbranch -r1.1 -N -c file1" \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+diff -c -N -r1\.1\.2\.1 -r1\.1
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file1 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6496,8 +6499,9 @@
dotest_fail death2-diff-6 "${testcvs} -q diff -rtag -N -c ." \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+diff -c -N -r1\.1 file1
\*\*\* file1 [-a-zA-Z0-9: ]* [0-9.]*
--- /dev/null ${RFCDATE_EPOCH}
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6532,8 +6536,8 @@
dotest_fail death2-diff-8 "${testcvs} -q diff -N -c file1" \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+diff -c -N file1
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file1 ${RFCDATE}
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6607,8 +6611,9 @@
dotest_fail death2-diff-10 "${testcvs} -q diff -rtag -N -c file3" \
"Index: file3
===================================================================
-RCS file: file3
-diff -N file3
+RCS file: $CVSROOT_DIRNAME/first-dir/Attic/file3,v
+retrieving revision 1\.1\.2\.1
+diff -c -N -r1\.1\.2\.1 file3
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file3 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6640,7 +6645,7 @@
RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
retrieving revision 1\.1
retrieving revision 1\.1\.2\.2
-diff -c -r1\.1 -r1\.1\.2\.2
+diff -c -N -r1\.1 -r1\.1\.2\.2
\*\*\* file1 ${RFCDATE} [0-9.]*
--- file1 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6650,8 +6655,9 @@
! second revision
Index: file2
===================================================================
-RCS file: file2
-diff -N file2
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file2,v
+retrieving revision 1\.1\.2\.2
+diff -c -N -r1\.1\.2\.2 file2
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file2 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6660,8 +6666,9 @@
${PLUS} branch revision
Index: file3
===================================================================
-RCS file: file3
-diff -N file3
+RCS file: ${CVSROOT_DIRNAME}/first-dir/Attic/file3,v
+retrieving revision 1\.1\.2\.1
+diff -c -N -r1\.1\.2\.1 file3
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file3 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6670,8 +6677,9 @@
${PLUS} first revision
Index: file4
===================================================================
-RCS file: file4
-diff -N file4
+RCS file: $CVSROOT_DIRNAME/first-dir/file4,v
+retrieving revision 1\.1
+diff -c -N -r1\.1 file4
\*\*\* file4 ${RFCDATE} [0-9.]*
--- /dev/null ${RFCDATE_EPOCH}
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6696,8 +6704,9 @@
dotest_fail death2-diff-14 "${testcvs} -q diff -r rdiff-tag -c -N" \
"Index: file1
===================================================================
-RCS file: file1
-diff -N file1
+RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+retrieving revision 1\.1
+diff -c -N -r1\.1\.2\.1 -r1\.1
\*\*\* /dev/null ${RFCDATE_EPOCH}
--- file1 ${RFCDATE} [0-9.]*
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -8761,9 +8770,9 @@
retrieving revision 1\.2
diff -r1\.1 -r1\.2
1c1
-< I am the first foo, and my name is \$""Name: \$\.
+< I am the first foo, and my name is \$""Name: first \$\.
---
-> I am the second foo, and my name is \$""Name: \$\."
+> I am the second foo, and my name is \$""Name: second \$\."
echo "I am the once and future foo, and my name is $""Name$." > foo.c
dotest_fail rcslib-diff10 "${testcvs} diff -r first" \
@@ -8774,7 +8783,7 @@
retrieving revision 1\.1
diff -r1\.1 foo\.c
1c1
-< I am the first foo, and my name is \$""Name: \$\.
+< I am the first foo, and my name is \$""Name: first \$\.
---
> I am the once and future foo, and my name is \$""Name\$\."
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog diff.c rcs.h rcscmds.c sanit... [signed-commits3],
Derek Robert Price <=