Fossil SCM
merge from trunk
Commit
454658c0b0667227b398e244995652ef834e4ea3
Parent
def52067be777e3…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -513,11 +513,11 @@ | ||
| 513 | 513 | " WHERE datetime(mtime)>=%Q" |
| 514 | 514 | " AND type='ci' AND objid=%d", |
| 515 | 515 | zDate, rid |
| 516 | 516 | ); |
| 517 | 517 | if( b ){ |
| 518 | - fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)" | |
| 518 | + fossil_fatal("ancestor check-in [%.10s] (%s) is not older (clock skew?)" | |
| 519 | 519 | " Use -f to override.", zUuid, zDate); |
| 520 | 520 | } |
| 521 | 521 | #endif |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | 524 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -513,11 +513,11 @@ | |
| 513 | " WHERE datetime(mtime)>=%Q" |
| 514 | " AND type='ci' AND objid=%d", |
| 515 | zDate, rid |
| 516 | ); |
| 517 | if( b ){ |
| 518 | fossil_fatal("ancestor check-in [%.10s] (%s) is younger (clock skew?)" |
| 519 | " Use -f to override.", zUuid, zDate); |
| 520 | } |
| 521 | #endif |
| 522 | } |
| 523 | |
| 524 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -513,11 +513,11 @@ | |
| 513 | " WHERE datetime(mtime)>=%Q" |
| 514 | " AND type='ci' AND objid=%d", |
| 515 | zDate, rid |
| 516 | ); |
| 517 | if( b ){ |
| 518 | fossil_fatal("ancestor check-in [%.10s] (%s) is not older (clock skew?)" |
| 519 | " Use -f to override.", zUuid, zDate); |
| 520 | } |
| 521 | #endif |
| 522 | } |
| 523 | |
| 524 |