[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog update.c
From: |
Jim Hyslop |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog update.c |
Date: |
Mon, 12 Jun 2006 16:01:33 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Jim Hyslop <jhyslop> 06/06/12 16:01:32
Modified files:
src : ChangeLog update.c
Log message:
* update.c: revert changes, since Derek fixed it in rev 1.262
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3446&r2=1.3447
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.264&r2=1.265
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3446
retrieving revision 1.3447
diff -u -b -r1.3446 -r1.3447
--- ChangeLog 12 Jun 2006 02:33:14 -0000 1.3446
+++ ChangeLog 12 Jun 2006 16:01:32 -0000 1.3447
@@ -1,3 +1,7 @@
+2006-06-12 Jim Hyslop <address@hidden>
+
+ * update.c: revert changes, since Derek fixed it in rev 1.262
+
2006-06-11 Jim Hyslop <address@hidden>
* server.h, server.c, update.c: wrap various server-related functions
Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -b -r1.264 -r1.265
--- update.c 12 Jun 2006 02:33:14 -0000 1.264
+++ update.c 12 Jun 2006 16:01:32 -0000 1.265
@@ -488,11 +488,10 @@
preload_update_dir ? preload_update_dir : "(null)", xdotemplate,
repository ? repository : "(null)");
-#ifdef SERVER_SUPPORT
/* Set globals. */
if (server_active && server_use_bases ())
bases = true;
-#endif /* SERVER_SUPPORT */
+
/* fill in the statics */
options = xoptions;
tag = xtag;
@@ -2010,11 +2009,7 @@
/* FIXME: the noexec case is broken. RCS_merge could be doing the
xcmp on the temporary files without much hassle, I think. */
- if (!noexec &&
-#ifdef SERVER_SUPPORT
- !bases &&
-#endif /* SERVER_SUPPORT */
- !xcmp (backup, finfo->file))
+ if (!noexec && !bases && !xcmp (backup, finfo->file))
{
if (!quiet)
{
@@ -2032,13 +2027,11 @@
goto out;
}
-#ifdef SERVER_SUPPORT
if (!bases)
/* The client may determine this is a conflict rather than
* modified. Let it write the correct message.
*/
write_letter (finfo, 'M');
-#endif /* SERVER_SUPPORT */
}
retval = 0;
out:
@@ -2385,6 +2378,7 @@
server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
NULL, NULL);
#endif /* SERVER_SUPPORT */
+
freevers_ts (&xvers);
return;
}
@@ -2519,11 +2513,7 @@
/* FIXME: It would be more consistent if the client printed this
* message when BASES.
*/
- if (!really_quiet
-#ifdef SERVER_SUPPORT
- && bases
-#endif
- )
+ if (!really_quiet && bases)
write_letter (finfo, 'M');
status = 0;
}
@@ -2558,7 +2548,6 @@
*/
write_letter (finfo, 'C');
}
-#ifdef SERVER_SUPPORT
else if (!bases) /* status == 0 */
{
bool unchanged, isbase;
@@ -2602,7 +2591,6 @@
*/
goto out;
}
-#endif /* SERVER_SUPPORT */
/* The file has changed, but if we just checked it out it may
still have the same timestamp it did when it was first
@@ -2616,9 +2604,7 @@
again won't cost much in that case. */
RegisterMerge (finfo, vers, backup, status, false);
-#ifdef SERVER_SUPPORT
out:
-#endif /* SERVER_SUPPORT */
free (rev1);
free (rev2);
free (backup);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog update.c,
Jim Hyslop <=