Fossil SCM
Fix a typo in a check-in race warning message.
Commit
66f06fe23b56b43736c8d9ed994e28e734fc9f494427c273cfc89ff914040067
Parent
0dba0f4b99c7de0…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -2382,11 +2382,11 @@ | ||
| 2382 | 2382 | sqlite3_int64 mtime, iNow; |
| 2383 | 2383 | defossilize(zUser); |
| 2384 | 2384 | iNow = time(NULL); |
| 2385 | 2385 | if( blob_is_int64(&xfer.aToken[3], &mtime) && iNow>mtime ){ |
| 2386 | 2386 | iNow = time(NULL); |
| 2387 | - fossil_print("\nParent check-in lock by %s %s ago\n", | |
| 2387 | + fossil_print("\nParent check-in locked by %s %s ago\n", | |
| 2388 | 2388 | zUser, human_readable_age((iNow+1-mtime)/86400.0)); |
| 2389 | 2389 | }else{ |
| 2390 | 2390 | fossil_print("\nParent check-in locked by %s\n", zUser); |
| 2391 | 2391 | } |
| 2392 | 2392 | g.ckinLockFail = fossil_strdup(zUser); |
| 2393 | 2393 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2382,11 +2382,11 @@ | |
| 2382 | sqlite3_int64 mtime, iNow; |
| 2383 | defossilize(zUser); |
| 2384 | iNow = time(NULL); |
| 2385 | if( blob_is_int64(&xfer.aToken[3], &mtime) && iNow>mtime ){ |
| 2386 | iNow = time(NULL); |
| 2387 | fossil_print("\nParent check-in lock by %s %s ago\n", |
| 2388 | zUser, human_readable_age((iNow+1-mtime)/86400.0)); |
| 2389 | }else{ |
| 2390 | fossil_print("\nParent check-in locked by %s\n", zUser); |
| 2391 | } |
| 2392 | g.ckinLockFail = fossil_strdup(zUser); |
| 2393 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2382,11 +2382,11 @@ | |
| 2382 | sqlite3_int64 mtime, iNow; |
| 2383 | defossilize(zUser); |
| 2384 | iNow = time(NULL); |
| 2385 | if( blob_is_int64(&xfer.aToken[3], &mtime) && iNow>mtime ){ |
| 2386 | iNow = time(NULL); |
| 2387 | fossil_print("\nParent check-in locked by %s %s ago\n", |
| 2388 | zUser, human_readable_age((iNow+1-mtime)/86400.0)); |
| 2389 | }else{ |
| 2390 | fossil_print("\nParent check-in locked by %s\n", zUser); |
| 2391 | } |
| 2392 | g.ckinLockFail = fossil_strdup(zUser); |
| 2393 |