[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs doc/stamp-1 doc/stamp-vti doc/version-clie...
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs doc/stamp-1 doc/stamp-vti doc/version-clie... |
|
Date: |
Wed, 30 Jan 2008 16:49:56 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 08/01/30 16:49:56
Modified files:
doc : stamp-1 stamp-vti version-client.texi
version.texi
src : ChangeLog sanity.sh update.c
windows-NT : config.h config.h.in stamp-chi
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-1?cvsroot=cvs&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version-client.texi?cvsroot=cvs&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3558&r2=1.3559
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1192&r2=1.1193
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.277&r2=1.278
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h?cvsroot=cvs&r1=1.219&r2=1.220
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in?cvsroot=cvs&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/stamp-chi?cvsroot=cvs&r1=1.129&r2=1.130
Patches:
Index: doc/stamp-1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-1,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- doc/stamp-1 24 Aug 2007 18:10:29 -0000 1.94
+++ doc/stamp-1 30 Jan 2008 16:49:54 -0000 1.95
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 August 2007
address@hidden UPDATED 26 August 2007
@set UPDATED-MONTH August 2007
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- doc/stamp-vti 28 Jan 2008 05:32:58 -0000 1.208
+++ doc/stamp-vti 30 Jan 2008 16:49:54 -0000 1.209
@@ -1,4 +1,4 @@
address@hidden UPDATED 27 January 2008
address@hidden UPDATED 28 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
Index: doc/version-client.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version-client.texi,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- doc/version-client.texi 24 Aug 2007 18:10:29 -0000 1.94
+++ doc/version-client.texi 30 Jan 2008 16:49:54 -0000 1.95
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 August 2007
address@hidden UPDATED 26 August 2007
@set UPDATED-MONTH August 2007
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- doc/version.texi 28 Jan 2008 05:32:58 -0000 1.210
+++ doc/version.texi 30 Jan 2008 16:49:54 -0000 1.211
@@ -1,4 +1,4 @@
address@hidden UPDATED 27 January 2008
address@hidden UPDATED 28 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3558
retrieving revision 1.3559
diff -u -b -r1.3558 -r1.3559
--- src/ChangeLog 28 Jan 2008 05:43:00 -0000 1.3558
+++ src/ChangeLog 30 Jan 2008 16:49:55 -0000 1.3559
@@ -1,3 +1,10 @@
+2008-01-29 Derek R. Price <address@hidden>
+ Paul Edwards <address@hidden>
+
+ * update.c (join_file): Detect deletion conflicts.
+ * sanity.sh (join, join4): Adjusted for this fix.
+ (join8, join9): Add new tests for conflicts.
+
2008-01-27 Mark D. Baushke <address@hidden>
* client.c (start_rsh_server): Use CVS_SSH for the :extssh:
@@ -8043,7 +8050,7 @@
2003-11-01 Larry Jones <address@hidden>
* filesubr.c (xcmp): Make sure S_ISLNK exists before calling it.
- (Reported by Paul Edwards <address@hidden>.)
+ (Reported by Paul Edwards <address@hidden>.)
2003-10-31 Derek Price <address@hidden>
Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -u -b -r1.1192 -r1.1193
--- src/sanity.sh 25 Jan 2008 07:17:36 -0000 1.1192
+++ src/sanity.sh 30 Jan 2008 16:49:55 -0000 1.1193
@@ -2237,7 +2237,7 @@
tests="${tests} rcslib multibranch import importb importc importX"
tests="$tests importX2 import-CVS import-quirks"
tests="${tests} update-p import-after-initial branch-after-import"
- tests="${tests} join join2 join3 join4 join5 join6 join7"
+ tests="${tests} join join2 join3 join4 join5 join6 join7 join8 join9"
tests="${tests} join-readonly-conflict join-admin join-admin-2"
tests="${tests} join-rm"
tests="${tests} new newb conflicts conflicts2 conflicts3 conflicts4"
@@ -6719,7 +6719,8 @@
# and join
dotest death-95 "$testcvs -q update -j HEAD" \
-"$SPROG update: file file1 has been modified, but has been removed in revision
HEAD
+"$SPROG update: file \`file1' is modified since GCA (1\.3), but has been
removed in revision HEAD
+C file1
$SPROG update: file file3 exists, but has been added in revision HEAD"
dotest_fail death-file4-7 "test -f file4"
@@ -11102,33 +11103,35 @@
U first-dir/file3
$SPROG checkout: scheduling \`first-dir/file3' for removal
U first-dir/file4
-$SPROG checkout: scheduling \`first-dir/file4' for removal
+$SPROG checkout: file \`first-dir/file4' is modified since GCA (1\.1), but has
been removed in revision T2
+C first-dir/file4
U first-dir/file7
$SPROG checkout: file first-dir/file9 does not exist, but is present in
revision T2"
# Verify that the right changes have been scheduled.
cd first-dir
- dotest join-17 "${testcvs} -q update" \
+ dotest_fail join-17 "$testcvs -q update" \
'A file1
R file3
-R file4'
+C file4'
# Modify file4 locally, and do an update with a merge.
cd ../../1/first-dir
echo 'third revision of file4' > file4
- dotest join-18 "${testcvs} -q update -jT1 -jT2 ." \
+ dotest join-18 "$testcvs -q update -jT1 -jT2 ." \
"$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`file1'\.
$SPROG update: file file2 exists, but has been added in revision T2
$SPROG update: scheduling \`file3' for removal
M file4
-$SPROG update: file file4 is locally modified, but has been removed in
revision T2
+$SPROG update: file \`file4' is locally modified, but has been removed in
revision T2
+C file4
$SPROG update: file file9 does not exist, but is present in revision T2"
# Verify that the right changes have been scheduled.
- dotest join-19 "${testcvs} -q update" \
+ dotest_fail join-19 "$testcvs -q update" \
'A file1
R file3
-M file4'
+C file4'
# Do a checkout with a merge from a single revision.
@@ -11151,17 +11154,19 @@
U first-dir/file3
$SPROG checkout: scheduling \`first-dir/file3' for removal
U first-dir/file4
-$SPROG checkout: file first-dir/file4 has been modified, but has been removed
in revision branch
+$SPROG checkout: file \`first-dir/file4' is modified since GCA (1\.1), but has
been removed in revision branch
+C first-dir/file4
U first-dir/file7
$SPROG checkout: file first-dir/file9 does not exist, but is present in
revision branch"
# Verify that the right changes have been scheduled.
# The M file2 line is a bug; see above join-20.
cd first-dir
- dotest join-21 "${testcvs} -q update" \
+ dotest_fail join-21 "$testcvs -q update" \
'A file1
M file2
-R file3'
+R file3
+C file4'
# Checkout the main line again.
cd ../../1
@@ -11177,22 +11182,23 @@
# The file2 handling is a bug; see above join-20.
cd first-dir
echo 'third revision of file4' > file4
- dotest join-23 "${testcvs} -q update -jbranch ." \
+ dotest join-23 "$testcvs -q update -jbranch ." \
"$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`file1'\.
$SPROG update: Replacing \`file2' with contents of revision 1\.1\.2\.2\.
M file2
$SPROG update: scheduling \`file3' for removal
M file4
-$SPROG update: file file4 is locally modified, but has been removed in
revision branch
+$SPROG update: file \`file4' is locally modified, but has been removed in
revision branch
+C file4
$SPROG update: file file9 does not exist, but is present in revision branch"
# Verify that the right changes have been scheduled.
# The M file2 line is a bug; see above join-20
- dotest join-24 "${testcvs} -q update" \
+ dotest_fail join-24 "$testcvs -q update" \
'A file1
M file2
R file3
-M file4'
+C file4'
cd ..
@@ -11223,14 +11229,16 @@
$SPROG update: Replacing \`file2' with contents of revision 1\.1\.2\.2\.
M file2
$SPROG update: scheduling \`file3' for removal
-$SPROG update: file file4 has been modified, but has been removed in revision
branch
+$SPROG update: file \`file4' is modified since GCA (1\.1), but has been
removed in revision branch
+C file4
$SPROG update: scheduling addition from revision 1\.1 of \`file8'\.
$SPROG update: scheduling addition from revision 1\.1\.2\.2 of \`file9'\."
# Verify that the right changes have been scheduled.
- dotest join-29 "${testcvs} -q update" \
+ dotest_fail join-29 "$testcvs -q update" \
"A file1
M file2
R file3
+C file4
A file8
A file9"
@@ -11257,17 +11265,19 @@
U file3
$SPROG update: scheduling \`file3' for removal
U file4
-$SPROG update: file file4 has been modified, but has been removed in revision
branch
+$SPROG update: file \`file4' is modified since GCA (1\.1), but has been
removed in revision branch
+C file4
U file7
$SPROG update: \`file8' is no longer in the repository
$SPROG update: scheduling addition from revision 1\.1 of \`file8'\.
$SPROG update: \`file9' is no longer in the repository
$SPROG update: scheduling addition from revision 1\.1\.2\.2 of \`file9'\."
# Verify that the right changes have been scheduled.
- dotest join-twobranch-3 "${testcvs} -q update" \
+ dotest_fail join-twobranch-3 "$testcvs -q update" \
"A file1
M file2
R file3
+C file4
A file8
A file9"
@@ -11697,20 +11707,21 @@
$SPROG update: file file2 exists, but has been added in revision T2
$SPROG update: scheduling \`file3' for removal
M file4
-$SPROG update: file file4 is locally modified, but has been removed in
revision T2
+$SPROG update: file \`file4' is locally modified, but has been removed in
revision T2
+C file4
R file6
A file7
R file8
R file9
-${SPROG} update: file file9 does not exist, but is present in revision T2"
+$SPROG update: file file9 does not exist, but is present in revision T2"
# Verify that the right changes have been scheduled.
- dotest join4-19 "${testcvs} -q update" \
+ dotest_fail join4-19 "${testcvs} -q update" \
'A file1
R file10
A file2
R file3
-M file4
+C file4
R file6
A file7
R file8
@@ -11952,6 +11963,118 @@
+ join8)
+ # In this test case, we have 2 projects, one called "pvcs" and one
+ # called "project". The "pvcs" project has modified the file, while
+ # the "project" project has caused a deletion. When "project" is
+ # merged into "pvcs", we expect CVS to detect a conflict.
+ mkdir join8; cd join8
+ mkdir combine
+ mkdir base
+ mkdir pvcs
+ mkdir project
+
+ echo "aaa" >base/file.txt
+ echo "bbb" >pvcs/file.txt
+ echo "ccc" >project/xxx.txt
+
+ cd base
+ dotest join8-1 \
+"$testcvs import -b 1.1.101 -ko -m 'base import' join8 base base-1" \
+"N join8/file\.txt
+
+No conflicts created by this import"
+
+ cd ../pvcs
+ dotest join8-2 \
+"$testcvs import -b 1.1.201 -ko -m 'pvcs import' join8 pvcs pvcs-1" \
+"C join8/file\.txt
+
+1 conflicts created by this import.
+Use the following command to help the merge:
+
+ $SPROG checkout -j<prev_rel_tag> -jpvcs-1 join8"
+
+ cd ../project
+ dotest join8-3 \
+"$testcvs import -b 1.1.301 -ko -m 'project import' join8 project project-1" \
+"N join8/xxx\.txt
+
+No conflicts created by this import"
+
+ cd ..
+ dotest join8-4 \
+"$testcvs checkout -r pvcs-1 -j base-1 -j project-1 -d combine join8" \
+"$SPROG checkout: Updating combine
+U combine/file\.txt
+$SPROG checkout: file \`combine/file\.txt' is modified since GCA (1\.1), but
has been removed in revision project-1
+C combine/file.txt
+$SPROG checkout: scheduling addition from revision 1\.1\.301\.1 of
\`combine/xxx\.txt'\."
+
+ cd ..
+ dokeep
+ rm -rf join8
+ rm -rf $CVSROOT_DIRNAME/join8
+ ;;
+
+
+
+ join9)
+ # In this test case, we have 2 projects, one called "pvcs" and one
+ # called "project". The "pvcs" project has not modified the file,
+ # while the "project" project has caused a deletion. When "project"
+ # is merged into "pvcs", we expect CVS to remove the file without
+ # fuss, as there is no conflict.
+ mkdir join9; cd join9
+ mkdir combine
+ mkdir base
+ mkdir pvcs
+ mkdir project
+
+ echo "aaa" >base/file.txt
+ echo "aaa" >pvcs/file.txt
+ echo "ccc" >project/xxx.txt
+
+ cd base
+ dotest join9-1 \
+"$testcvs import -b 1.1.101 -ko -m 'base import' join9 base base-1" \
+"N join9/file\.txt
+
+No conflicts created by this import"
+
+ cd ../pvcs
+ dotest join9-2 \
+"$testcvs import -b 1.1.201 -ko -m 'pvcs import' join9 pvcs pvcs-1" \
+"C join9/file\.txt
+
+1 conflicts created by this import.
+Use the following command to help the merge:
+
+ $SPROG checkout -j<prev_rel_tag> -jpvcs-1 join9"
+
+ cd ../project
+ dotest join9-3 \
+"$testcvs import -b 1.1.301 -ko -m 'project import' join9 project project-1" \
+"N join9/xxx\.txt
+
+No conflicts created by this import"
+
+ cd ..
+ dotest join9-4 \
+"$testcvs checkout -r pvcs-1 -j base-1 -j project-1 -d combine join9" \
+"$SPROG checkout: Updating combine
+U combine/file\.txt
+$SPROG checkout: scheduling \`combine/file\.txt' for removal
+$SPROG checkout: scheduling addition from revision 1\.1\.301\.1 of
\`combine/xxx\.txt'\."
+
+ cd ..
+ dokeep
+ rm -rf join9
+ rm -rf $CVSROOT_DIRNAME/join9
+ ;;
+
+
+
join-readonly-conflict)
# Previously, only tests 1 & 11 were being tested. I added the
# intermediate dotest's to try and diagnose a different failure
Index: src/update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- src/update.c 20 Dec 2007 16:09:26 -0000 1.277
+++ src/update.c 30 Jan 2008 16:49:55 -0000 1.278
@@ -1407,8 +1407,10 @@
{
Node *n;
- /* FIXME: Throwing away the original revision info is almost
- certainly wrong -- what if join_rev1 is "BASE"? */
+ /* FIXME: It seems like we should be preserving ts_user
+ * & ts_rcs here, but setting them causes problems in
+ * join_file().
+ */
if (vers_ts->vn_user != NULL)
free (vers_ts->vn_user);
if (vers_ts->vn_rcs != NULL)
@@ -2141,9 +2143,8 @@
if (rev2 == NULL || RCS_isdead (vers->srcfile, rev2))
{
char *mrev;
-
- if (rev2 != NULL)
- free (rev2);
+ short conflict = 0;
+ char *modmsg = NULL;
/* If the first revision doesn't exist either, then there is
no change between the two revisions, so we don't do
@@ -2152,6 +2153,8 @@
{
if (rev1 != NULL)
free (rev1);
+ if (rev2 != NULL)
+ free (rev2);
return;
}
@@ -2191,8 +2194,9 @@
|| vers->vn_user[0] == '-'
|| RCS_isdead (vers->srcfile, vers->vn_user))
{
- if (rev1 != NULL)
free (rev1);
+ if (rev2 != NULL)
+ free (rev2);
return;
}
@@ -2201,53 +2205,109 @@
resolve. No_Difference will already have been called in
this case, so comparing the timestamps is sufficient to
determine whether the file is locally modified. */
- if (STREQ (vers->vn_user, "0")
- || (vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs)))
+ if (/* added */ STREQ (vers->vn_user, "0")
+ || /* locally modified */
+ vers->ts_user && !STREQ (vers->ts_user, vers->ts_rcs))
+ conflict = 1;
+
+ if (!conflict
+ && /* may have changed */
+ strcmp (rev1, vers->vn_user))
+ {
+ /* The removal should happen if either the file has never changed
+ * on the destination or the file has changed to be identical to
+ * the first join revision.
+ *
+ * ------R-----------D
+ * |
+ * \----J1---J2-----S
+ *
+ * So:
+ *
+ * J2 is dead.
+ * D is destination.
+ * R is source branch root/GCA.
+ * if J1 == D removal should happen
+ * if D == R removal should happen
+ * otherwise, fail.
+ *
+ * (In the source, J2 = REV2, D = VN_USER, R = GCA computed below)
+ */
+ char *gca_rev1 = gca (rev1, vers->vn_user);
+ if (/* genuinely changed on destination branch */
+ RCS_cmp_file (vers->srcfile, NULL, gca_rev1, NULL,
+ vers->vn_user, vers->options, finfo->file)
+ && /* genuinely different from REV1 */
+ RCS_cmp_file (vers->srcfile, jrev1, rev1, NULL,
+ vers->vn_user, vers->options, finfo->file))
{
- if (jdate2 != NULL)
- error (0, 0,
- "file %s is locally modified, but has been removed in
revision %s as of %s",
- finfo->fullname, jrev2, jdate2);
- else
- error (0, 0,
- "file %s is locally modified, but has been removed in
revision %s",
- finfo->fullname, jrev2);
+ conflict = 1;
+ modmsg = xmalloc (14 + strlen (gca_rev1));
+ sprintf (modmsg, " since GCA (%s)", gca_rev1);
+ }
+ }
- /* FIXME: Should we arrange to return a non-zero exit
- status? */
+ if (conflict)
+ {
+ const char *locally;
+ char *cp, *brmsg;
- if (rev1 != NULL)
- free (rev1);
+ if (!modmsg)
+ modmsg = xstrdup ("");
- return;
- }
+ if (/* added */ !strcmp (vers->vn_user, "0")
+ || /* locally modified */
+ vers->ts_user && strcmp (vers->ts_user, vers->ts_rcs))
+ locally = " locally";
+ else
+ locally = "";
- /* If only one join tag was specified, and the user file has
- been changed since the greatest common ancestor (rev1),
- then there is a conflict we can not resolve. See above for
- the rationale. */
- if (!join_rev2 && !STREQ (rev1, vers->vn_user))
- {
if (jdate2)
- error (0, 0,
- "file %s has been modified, but has been removed in
revision %s as of %s",
- finfo->fullname, jrev2, jdate2);
+ brmsg = Xasprintf (" as of %s", jdate2);
else
+ brmsg = xstrdup ("");
+
error (0, 0,
- "file %s has been modified, but has been removed in
revision %s",
- finfo->fullname, jrev2);
+ "file %s is%s modified%s, but has been removed in revision
%s%s",
+ quote (finfo->fullname), locally, modmsg, jrev2, brmsg);
- /* FIXME: Should we arrange to return a non-zero exit
- status? */
+ /* FIXME: vers->ts_user should always be set here but sometimes
+ * isn't, namely when checkout_file() has just created the file,
+ * but simply setting it in checkout_file() appears to cause other
+ * problems.
+ */
+ if (isfile (finfo->file))
+ cp = time_stamp (finfo->file);
+ else
+ cp = xstrdup (vers->ts_user);
- if (rev1 != NULL)
+ Register (finfo->entries, finfo->file, vers->vn_user,
+ "Result of merge", vers->options, vers->tag, vers->date,
+ cp);
+ write_letter (finfo, 'C');
+ free (cp);
+
+#ifdef SERVER_SUPPORT
+ /* Abuse server_checked_in() to send the updated entry without
+ * needing to update the file.
+ */
+ if (server_active)
+ server_checked_in (finfo->file, finfo->update_dir,
+ finfo->repository);
+#endif
+
+ free (brmsg);
+ free (modmsg);
free (rev1);
+ if (rev2)
+ free (rev2);
return;
}
- if (rev1 != NULL)
free (rev1);
+ if (rev2 != NULL)
+ free (rev2);
/* The user file exists and has not been modified. Mark it
for removal. FIXME: If we are doing a checkout, this has
Index: windows-NT/config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- windows-NT/config.h 28 Jan 2008 05:33:00 -0000 1.219
+++ windows-NT/config.h 30 Jan 2008 16:49:55 -0000 1.220
@@ -681,6 +681,9 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -1238,7 +1241,7 @@
/* The default remote shell to use, if one does not specify the CVS_SSH
environment variable. */
-#define SSH_DFLT "putty"
+#undef SSH_DFLT
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
Index: windows-NT/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- windows-NT/config.h.in 28 Jan 2008 05:33:00 -0000 1.147
+++ windows-NT/config.h.in 30 Jan 2008 16:49:56 -0000 1.148
@@ -674,6 +674,9 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -1231,7 +1234,7 @@
/* The default remote shell to use, if one does not specify the CVS_SSH
environment variable. */
-#define SSH_DFLT "putty"
+#undef SSH_DFLT
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
Index: windows-NT/stamp-chi
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/stamp-chi,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- windows-NT/stamp-chi 27 Aug 2007 02:13:26 -0000 1.129
+++ windows-NT/stamp-chi 30 Jan 2008 16:49:56 -0000 1.130
@@ -674,6 +674,9 @@
/* Define to 1 if you have the `mknod' function. */
#undef HAVE_MKNOD
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@@ -1229,6 +1232,10 @@
'size_t'. */
#undef SIZE_T_SUFFIX
+/* The default remote shell to use, if one does not specify the CVS_SSH
+ environment variable. */
+#undef SSH_DFLT
+
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs doc/stamp-1 doc/stamp-vti doc/version-clie...,
Derek Robert Price <=