Fossil SCM
Use "multiple leaves on the same branch" in stead of "ambiguous branch". Let's see if people like this better.
Commit
cd0d6b4dda20173803e07fe4ed24c49b1d34e8cb
Parent
b9fbfac5ff85232…
4 files changed
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2119,8 +2119,8 @@ | ||
| 2119 | 2119 | |
| 2120 | 2120 | if( !g.markPrivate ){ |
| 2121 | 2121 | autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1)); |
| 2122 | 2122 | } |
| 2123 | 2123 | if( count_nonbranch_children(vid)>1 ){ |
| 2124 | - fossil_print("**** warning: an ambiguous branch has occurred *****\n"); | |
| 2124 | + fossil_print("**** warning: multiple leaves on the same branch are formed *****\n"); | |
| 2125 | 2125 | } |
| 2126 | 2126 | } |
| 2127 | 2127 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2119,8 +2119,8 @@ | |
| 2119 | |
| 2120 | if( !g.markPrivate ){ |
| 2121 | autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1)); |
| 2122 | } |
| 2123 | if( count_nonbranch_children(vid)>1 ){ |
| 2124 | fossil_print("**** warning: an ambiguous branch has occurred *****\n"); |
| 2125 | } |
| 2126 | } |
| 2127 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2119,8 +2119,8 @@ | |
| 2119 | |
| 2120 | if( !g.markPrivate ){ |
| 2121 | autosync_loop(SYNC_PUSH|SYNC_PULL, db_get_int("autosync-tries", 1)); |
| 2122 | } |
| 2123 | if( count_nonbranch_children(vid)>1 ){ |
| 2124 | fossil_print("**** warning: multiple leaves on the same branch are formed *****\n"); |
| 2125 | } |
| 2126 | } |
| 2127 |
+1
-1
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -461,11 +461,11 @@ | ||
| 461 | 461 | comment_print(z, zCom, 7, width, g.comFmtFlags); |
| 462 | 462 | fossil_free(z); |
| 463 | 463 | } |
| 464 | 464 | fossil_free(zLastBr); |
| 465 | 465 | db_finalize(&q); |
| 466 | - if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n"); | |
| 466 | + if( showForks && !zLastBr ) fossil_print("*** OK, no multiple leaves on the same branch found ***\n"); | |
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | /* |
| 470 | 470 | ** WEBPAGE: leaves |
| 471 | 471 | ** |
| 472 | 472 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -461,11 +461,11 @@ | |
| 461 | comment_print(z, zCom, 7, width, g.comFmtFlags); |
| 462 | fossil_free(z); |
| 463 | } |
| 464 | fossil_free(zLastBr); |
| 465 | db_finalize(&q); |
| 466 | if( showForks && !zLastBr ) fossil_print("*** OK, no ambiguous branch found ***\n"); |
| 467 | } |
| 468 | |
| 469 | /* |
| 470 | ** WEBPAGE: leaves |
| 471 | ** |
| 472 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -461,11 +461,11 @@ | |
| 461 | comment_print(z, zCom, 7, width, g.comFmtFlags); |
| 462 | fossil_free(z); |
| 463 | } |
| 464 | fossil_free(zLastBr); |
| 465 | db_finalize(&q); |
| 466 | if( showForks && !zLastBr ) fossil_print("*** OK, no multiple leaves on the same branch found ***\n"); |
| 467 | } |
| 468 | |
| 469 | /* |
| 470 | ** WEBPAGE: leaves |
| 471 | ** |
| 472 |
+1
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -222,11 +222,11 @@ | ||
| 222 | 222 | if( rid==0 ){ |
| 223 | 223 | fossil_fatal("no such object: %s\n", g.argv[2]); |
| 224 | 224 | } |
| 225 | 225 | show_common_info(rid, "uuid:", 1, 1); |
| 226 | 226 | } |
| 227 | - fossil_print("ambiguous branches:\n"); | |
| 227 | + fossil_print("multiple leaves on the same branch:\n"); | |
| 228 | 228 | leaves_cmd(); |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | /* |
| 232 | 232 | ** Show information about all tags on a given check-in. |
| 233 | 233 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -222,11 +222,11 @@ | |
| 222 | if( rid==0 ){ |
| 223 | fossil_fatal("no such object: %s\n", g.argv[2]); |
| 224 | } |
| 225 | show_common_info(rid, "uuid:", 1, 1); |
| 226 | } |
| 227 | fossil_print("ambiguous branches:\n"); |
| 228 | leaves_cmd(); |
| 229 | } |
| 230 | |
| 231 | /* |
| 232 | ** Show information about all tags on a given check-in. |
| 233 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -222,11 +222,11 @@ | |
| 222 | if( rid==0 ){ |
| 223 | fossil_fatal("no such object: %s\n", g.argv[2]); |
| 224 | } |
| 225 | show_common_info(rid, "uuid:", 1, 1); |
| 226 | } |
| 227 | fossil_print("multiple leaves on the same branch:\n"); |
| 228 | leaves_cmd(); |
| 229 | } |
| 230 | |
| 231 | /* |
| 232 | ** Show information about all tags on a given check-in. |
| 233 |
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1973,10 +1973,10 @@ | ||
| 1973 | 1973 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 1974 | 1974 | content_enable_dephantomize(1); |
| 1975 | 1975 | db_end_transaction(0); |
| 1976 | 1976 | } |
| 1977 | 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | - fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n" | |
| 1978 | + fossil_warning("***** WARNING: multiple leaves on the same branch are formed *****\n" | |
| 1979 | 1979 | "use \"fossil info\" for more details."); |
| 1980 | 1980 | } |
| 1981 | 1981 | return nErr; |
| 1982 | 1982 | } |
| 1983 | 1983 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1973,10 +1973,10 @@ | |
| 1973 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 1974 | content_enable_dephantomize(1); |
| 1975 | db_end_transaction(0); |
| 1976 | } |
| 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | fossil_warning("***** WARNING: an ambiguous branch has occurred *****\n" |
| 1979 | "use \"fossil info\" for more details."); |
| 1980 | } |
| 1981 | return nErr; |
| 1982 | } |
| 1983 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1973,10 +1973,10 @@ | |
| 1973 | manifest_crosslink_end(MC_PERMIT_HOOKS); |
| 1974 | content_enable_dephantomize(1); |
| 1975 | db_end_transaction(0); |
| 1976 | } |
| 1977 | if( (syncFlags & SYNC_CLONE)==0 && fossil_any_has_fork(g.rcvid) ){ |
| 1978 | fossil_warning("***** WARNING: multiple leaves on the same branch are formed *****\n" |
| 1979 | "use \"fossil info\" for more details."); |
| 1980 | } |
| 1981 | return nErr; |
| 1982 | } |
| 1983 |