Fossil SCM
Put --allow-fork back into the fossil ci "would fork" message. Everyone's unhappy now. :)
Commit
acb5324c7925fa68688887807a5269ff8d1c8769f43d0048cb73611a5bd5aa68
Parent
1926d1d5b363668…
1 file changed
+4
-4
+4
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2272,12 +2272,12 @@ | ||
| 2272 | 2272 | */ |
| 2273 | 2273 | if( !vid ){ |
| 2274 | 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | - fossil_fatal("would fork. \"update\" first or use --branch. See also\n" | |
| 2278 | - "https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); | |
| 2277 | + fossil_fatal("Would fork. \"update\" first, use --branch, or --allow-fork.\n" | |
| 2278 | + "See https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); | |
| 2279 | 2279 | } |
| 2280 | 2280 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2281 | 2281 | } |
| 2282 | 2282 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2283 | 2283 | && g.markPrivate==0 && !is_a_leaf(vid) |
| @@ -2284,12 +2284,12 @@ | ||
| 2284 | 2284 | ){ |
| 2285 | 2285 | /* Can't avoid duplicating this string because some C compilers |
| 2286 | 2286 | ** refuse to see static const char zErr[] = "... as "constant" |
| 2287 | 2287 | ** enough for a printf() style format string. (e.g. Clang 10) |
| 2288 | 2288 | */ |
| 2289 | - fossil_fatal("would fork. \"update\" first or use --branch. See also\n" | |
| 2290 | - "https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); | |
| 2289 | + fossil_fatal("Would fork. \"update\" first, use --branch or, --allow-fork.\n" | |
| 2290 | + "See https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); | |
| 2291 | 2291 | } |
| 2292 | 2292 | |
| 2293 | 2293 | /* |
| 2294 | 2294 | ** Do not allow a commit against a closed leaf unless the commit |
| 2295 | 2295 | ** ends up on a different branch. |
| 2296 | 2296 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2272,12 +2272,12 @@ | |
| 2272 | */ |
| 2273 | if( !vid ){ |
| 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | fossil_fatal("would fork. \"update\" first or use --branch. See also\n" |
| 2278 | "https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); |
| 2279 | } |
| 2280 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2281 | } |
| 2282 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2283 | && g.markPrivate==0 && !is_a_leaf(vid) |
| @@ -2284,12 +2284,12 @@ | |
| 2284 | ){ |
| 2285 | /* Can't avoid duplicating this string because some C compilers |
| 2286 | ** refuse to see static const char zErr[] = "... as "constant" |
| 2287 | ** enough for a printf() style format string. (e.g. Clang 10) |
| 2288 | */ |
| 2289 | fossil_fatal("would fork. \"update\" first or use --branch. See also\n" |
| 2290 | "https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); |
| 2291 | } |
| 2292 | |
| 2293 | /* |
| 2294 | ** Do not allow a commit against a closed leaf unless the commit |
| 2295 | ** ends up on a different branch. |
| 2296 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2272,12 +2272,12 @@ | |
| 2272 | */ |
| 2273 | if( !vid ){ |
| 2274 | if( sCiInfo.zBranch==0 ){ |
| 2275 | if( allowFork==0 && forceFlag==0 && g.markPrivate==0 |
| 2276 | && db_exists("SELECT 1 from event where type='ci'") ){ |
| 2277 | fossil_fatal("Would fork. \"update\" first, use --branch, or --allow-fork.\n" |
| 2278 | "See https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); |
| 2279 | } |
| 2280 | sCiInfo.zBranch = db_get("main-branch", "trunk"); |
| 2281 | } |
| 2282 | }else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0 |
| 2283 | && g.markPrivate==0 && !is_a_leaf(vid) |
| @@ -2284,12 +2284,12 @@ | |
| 2284 | ){ |
| 2285 | /* Can't avoid duplicating this string because some C compilers |
| 2286 | ** refuse to see static const char zErr[] = "... as "constant" |
| 2287 | ** enough for a printf() style format string. (e.g. Clang 10) |
| 2288 | */ |
| 2289 | fossil_fatal("Would fork. \"update\" first, use --branch or, --allow-fork.\n" |
| 2290 | "See https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching"); |
| 2291 | } |
| 2292 | |
| 2293 | /* |
| 2294 | ** Do not allow a commit against a closed leaf unless the commit |
| 2295 | ** ends up on a different branch. |
| 2296 |