Fossil SCM
Don't reference removed "fossil forks" command any more.
Commit
3a497793e97c58b14c0fcc8b7d6488edceedc94b
Parent
75e23ea9c212c2c…
2 files changed
+2
-2
+2
-1
+2
-2
| --- 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: a fork has occurred ***** use " | |
| 1979 | - "\"fossil forks\" for more details."); | |
| 1978 | + fossil_warning("***** WARNING: a fork has occurred *****\n" | |
| 1979 | + "use \"fossil leaves -multiple\" 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: a fork has occurred ***** use " |
| 1979 | "\"fossil forks\" 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: a fork has occurred *****\n" |
| 1979 | "use \"fossil leaves -multiple\" for more details."); |
| 1980 | } |
| 1981 | return nErr; |
| 1982 | } |
| 1983 |
+2
-1
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -11,11 +11,12 @@ | ||
| 11 | 11 | or HTML. |
| 12 | 12 | * Formally translate TH1 to Tcl return codes and vice-versa, where |
| 13 | 13 | necessary, in the Tcl integration subsystem. |
| 14 | 14 | * Better fork detection on [/help?cmd=update|fossil update], |
| 15 | 15 | [/help?cmd=status|fossil status] and related commands. |
| 16 | - * Add [/help?cmd=forks|fossil forks], for finding all forks. | |
| 16 | + * Add [/help?cmd=leaves|fossil leaves -multiple], for finding multiple | |
| 17 | + leaves on the same branch. | |
| 17 | 18 | |
| 18 | 19 | <h2>Changes for Version 1.32 (2015-03-14)</h2> |
| 19 | 20 | * When creating a new repository using [/help?cmd=init|fossil init], ensure |
| 20 | 21 | that the new repository is fully compatible with historical versions of |
| 21 | 22 | Fossil by having a valid manifest as RID 1. |
| 22 | 23 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -11,11 +11,12 @@ | |
| 11 | or HTML. |
| 12 | * Formally translate TH1 to Tcl return codes and vice-versa, where |
| 13 | necessary, in the Tcl integration subsystem. |
| 14 | * Better fork detection on [/help?cmd=update|fossil update], |
| 15 | [/help?cmd=status|fossil status] and related commands. |
| 16 | * Add [/help?cmd=forks|fossil forks], for finding all forks. |
| 17 | |
| 18 | <h2>Changes for Version 1.32 (2015-03-14)</h2> |
| 19 | * When creating a new repository using [/help?cmd=init|fossil init], ensure |
| 20 | that the new repository is fully compatible with historical versions of |
| 21 | Fossil by having a valid manifest as RID 1. |
| 22 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -11,11 +11,12 @@ | |
| 11 | or HTML. |
| 12 | * Formally translate TH1 to Tcl return codes and vice-versa, where |
| 13 | necessary, in the Tcl integration subsystem. |
| 14 | * Better fork detection on [/help?cmd=update|fossil update], |
| 15 | [/help?cmd=status|fossil status] and related commands. |
| 16 | * Add [/help?cmd=leaves|fossil leaves -multiple], for finding multiple |
| 17 | leaves on the same branch. |
| 18 | |
| 19 | <h2>Changes for Version 1.32 (2015-03-14)</h2> |
| 20 | * When creating a new repository using [/help?cmd=init|fossil init], ensure |
| 21 | that the new repository is fully compatible with historical versions of |
| 22 | Fossil by having a valid manifest as RID 1. |
| 23 |