Fossil SCM
Another "fork" -> "ambigeous branch" change
Commit
fe7f6f3cc19953deb434fb7705be309d87b44973
Parent
4359bd8df211979…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -429,11 +429,11 @@ | ||
| 429 | 429 | fossil_free(z); |
| 430 | 430 | } |
| 431 | 431 | } |
| 432 | 432 | fossil_free(zLastBr); |
| 433 | 433 | db_finalize(&q); |
| 434 | - if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branches found ***\n"); | |
| 434 | + if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n"); | |
| 435 | 435 | } |
| 436 | 436 | |
| 437 | 437 | /* |
| 438 | 438 | ** WEBPAGE: leaves |
| 439 | 439 | ** |
| 440 | 440 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -429,11 +429,11 @@ | |
| 429 | fossil_free(z); |
| 430 | } |
| 431 | } |
| 432 | fossil_free(zLastBr); |
| 433 | db_finalize(&q); |
| 434 | if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branches found ***\n"); |
| 435 | } |
| 436 | |
| 437 | /* |
| 438 | ** WEBPAGE: leaves |
| 439 | ** |
| 440 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -429,11 +429,11 @@ | |
| 429 | fossil_free(z); |
| 430 | } |
| 431 | } |
| 432 | fossil_free(zLastBr); |
| 433 | db_finalize(&q); |
| 434 | if( showForks && !zLastBr ) fossil_print("*** OK, no ambigeous branch found ***\n"); |
| 435 | } |
| 436 | |
| 437 | /* |
| 438 | ** WEBPAGE: leaves |
| 439 | ** |
| 440 |
+1
-1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -562,11 +562,11 @@ | ||
| 562 | 562 | } |
| 563 | 563 | if( nMerge ){ |
| 564 | 564 | fossil_warning("WARNING: %d uncommitted prior merges", nMerge); |
| 565 | 565 | } |
| 566 | 566 | if( isFork ){ |
| 567 | - fossil_warning("WARNING: fork detected, please do a \"fossil merge\""); | |
| 567 | + fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\""); | |
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | /* |
| 572 | 572 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 573 | 573 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -562,11 +562,11 @@ | |
| 562 | } |
| 563 | if( nMerge ){ |
| 564 | fossil_warning("WARNING: %d uncommitted prior merges", nMerge); |
| 565 | } |
| 566 | if( isFork ){ |
| 567 | fossil_warning("WARNING: fork detected, please do a \"fossil merge\""); |
| 568 | } |
| 569 | } |
| 570 | |
| 571 | /* |
| 572 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 573 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -562,11 +562,11 @@ | |
| 562 | } |
| 563 | if( nMerge ){ |
| 564 | fossil_warning("WARNING: %d uncommitted prior merges", nMerge); |
| 565 | } |
| 566 | if( isFork ){ |
| 567 | fossil_warning("WARNING: ambigeous branch, please do a \"fossil merge\""); |
| 568 | } |
| 569 | } |
| 570 | |
| 571 | /* |
| 572 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 573 |