Fossil

Check-in [82d69e7f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Because the sync status updates all occur on the same line make this client warning show up on its own line so the output doesn't get cluttered.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | no-race-commit
Files: files | file ages | folders
SHA3-256: 82d69e7fae0574b25764f51cddbc2679706f7398767a24328ccc837628477830
User & Date: andybradford 2019-06-27 03:54:52
Context
2019-06-29
03:17
Steps to prevent accidental forks during a commit when two users try to commit to the same parent at the same time. The first user to do the autosync pull takes a lock which causes the second user to get a "would fork" error, unless the --allow-fork or --force options are used. check-in: 03cc3329 user: drh tags: trunk
2019-06-27
21:22
Same as [28549ec2] Closed-Leaf check-in: 7ae81524 user: wyoung tags: inadvertent-checkin
03:54
Because the sync status updates all occur on the same line make this client warning show up on its own line so the output doesn't get cluttered. Closed-Leaf check-in: 82d69e7f user: andybradford tags: no-race-commit
2019-06-22
14:54
When doing a commit with autosync enabled, the first autosync now takes a temporary (24-hour) lock on the baseline commit in order to prevent any other connected user from simultaneously committing and creating an accidental fork. check-in: 222fc681 user: drh tags: no-race-commit
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/xfer.c.

2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
        ** lock.  USER-HOLDING-LOCK is the name of the user who originated
        ** the lock, and LOCK-TIME is the timestamp (seconds since 1970)
        ** when the lock was taken.
        */
        else if( blob_eq(&xfer.aToken[1], "ci-lock-fail") && xfer.nToken==4 ){
          char *zUser = blob_terminate(&xfer.aToken[2]);
          defossilize(zUser);
          fossil_print("Parent check-in locked by %s\n", zUser);
          g.ckinLockFail = 1;
        }
      }else

      /*   error MESSAGE
      **
      ** Report an error and abandon the sync session.







|







2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
        ** lock.  USER-HOLDING-LOCK is the name of the user who originated
        ** the lock, and LOCK-TIME is the timestamp (seconds since 1970)
        ** when the lock was taken.
        */
        else if( blob_eq(&xfer.aToken[1], "ci-lock-fail") && xfer.nToken==4 ){
          char *zUser = blob_terminate(&xfer.aToken[2]);
          defossilize(zUser);
          fossil_print("\nParent check-in locked by %s\n", zUser);
          g.ckinLockFail = 1;
        }
      }else

      /*   error MESSAGE
      **
      ** Report an error and abandon the sync session.