OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Oct-2005 13:41:35
Branch: HEAD Handle: 2005100712413500
Modified files:
openpkg-src/cvs cvs.patch.rse
Log:
synchronize master and slave repository on modifying commands also if
working copy is checked out from master repository
Summary:
Revision Changes Path
1.25 +17 -10 openpkg-src/cvs/cvs.patch.rse
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.24 -r1.25 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 7 Oct 2005 11:10:13 -0000 1.24
+++ openpkg-src/cvs/cvs.patch.rse 7 Oct 2005 11:41:35 -0000 1.25
@@ -1439,7 +1439,7 @@
retrieving revision 1.1.1.19
diff -u -d -r1.1.1.19 main.c
--- src/main.c 2 Oct 2005 15:17:21 -0000 1.1.1.19
-+++ src/main.c 7 Oct 2005 11:08:15 -0000
++++ src/main.c 7 Oct 2005 11:17:19 -0000
@@ -28,6 +28,10 @@
const char *program_path;
const char *cvs_cmd_name;
@@ -1976,7 +1976,7 @@
{
/* First check if a root was set via the command line. */
if (CVSroot_cmdline)
-@@ -1018,6 +1390,60 @@
+@@ -1018,6 +1390,67 @@
error (1, 0,
"or set the %s environment variable.", CVSROOT_ENV);
}
@@ -2006,6 +2006,13 @@
+ cvsroot_sync = e;
+ cvsroot_update_env = true;
+ }
++ else if ((e = cvsroot_lookup(NULL,
CVSroot_parsed->original, NULL)) != NULL) {
++ /* command modifies repository and we already
operare on
++ the master repository, so no need to switch to
it,
++ but remember to sync a possibly existing slave
repository. */
++ if (e->slavepath != NULL)
++ cvsroot_sync = e;
++ }
+ }
+ else {
+ if ((e = cvsroot_lookup(NULL, CVSroot_parsed->original,
NULL)) != NULL) {
@@ -2037,7 +2044,7 @@
}
/* Here begins the big loop over unique cvsroot values. We
-@@ -1050,13 +1476,20 @@
+@@ -1050,13 +1483,20 @@
end of things. */
while (server_active ||
@@ -2058,7 +2065,7 @@
{
/* Now we're 100% sure that we have a valid CVSROOT
variable. Parse it to see if we're supposed to do
-@@ -1082,7 +1515,12 @@
+@@ -1082,7 +1522,12 @@
save_errno = errno;
/* If this is "cvs init", the root need not exist yet.
*/
@@ -2071,7 +2078,7 @@
error (1, save_errno, "%s", path);
}
free (path);
-@@ -1100,7 +1538,11 @@
+@@ -1100,7 +1545,11 @@
predetermine whether CVSROOT/config overrides things from
read_cvsrc and other such places or vice versa. That sort
of thing probably needs more thought. */
@@ -2083,7 +2090,7 @@
{
/* If there was an error parsing the config file, parse_config
already printed an error. We keep going. Why? Because
-@@ -1130,7 +1572,31 @@
+@@ -1130,7 +1579,31 @@
}
#endif
@@ -2115,7 +2122,7 @@
#ifdef SERVER_SUPPORT
/* Don't worry about lock_cleanup_setup when the server is
* active since we can only go through this loop once in that
-@@ -1143,6 +1609,9 @@
+@@ -1143,6 +1616,9 @@
!current_parsed_root->isremote &&
#endif
!lock_cleanup_setup))
@@ -2125,7 +2132,7 @@
{
/* Set up to clean up any locks we might create on exit. */
cleanup_register (Lock_Cleanup);
-@@ -1151,7 +1620,32 @@
+@@ -1151,7 +1627,32 @@
/* Call our worker function. */
err = (*(cm->func)) (argc, argv);
@@ -2158,7 +2165,7 @@
/* Mark this root directory as done. When the server is
active, our list will be empty -- don't try and
remove it from the list. */
-@@ -1170,6 +1664,10 @@
+@@ -1170,6 +1671,10 @@
break;
} /* end of loop for cvsroot values */
@@ -2169,7 +2176,7 @@
dellist (&root_directories);
} /* end of stuff that gets done if the user DOESN'T ask for help */
-@@ -1429,6 +1927,12 @@
+@@ -1429,6 +1934,12 @@
TRACE (TRACE_FUNCTION, "format_date (%s)", datestr);
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
