Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Removed the "or --allow-fork" advice output from "fossil checkin" when forcing the checkin would fork the branch. It's good for Fossil to have this option, especially for automated tooling that needs to just bull forward blindly, but it's bad advice to give to interactive users. Let them discover it via --help, if they learn of it at all. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
66d55e9b436c203e64e3db417ad35866 |
| User & Date: | wyoung 2019-06-16 19:22:04 |
References
|
2019-06-18
| ||
| 01:48 | Partial walk-back of [66d55e9b43]: instead of simply removing the recommendation to pass --allow-fork to fossil checkin to solve the "would fork" problem, recommend instead that the user create a new branch with --branch. That advice causes Fossil to create a named branch rather than a nameless branch -- well, *duplicate-named*, anyway -- which is easier to cope with and doesn't make all the other Fossil instances in an organization start griping about unresolved forks. Only the user who created the named fork is bothered with creating and resolving the fork in this mode of operation. ... (check-in: 8dcf4ffc user: wyoung tags: trunk) | |
Context
|
2019-06-16
| ||
| 20:16 | Polishing pass on www/collisions.ipynb: improved docs, simplified the "sd" parameter as "spread", removed an empty cell, and renumbered the cells. ... (check-in: 847423ed user: wyoung tags: trunk) | |
| 19:22 | Removed the "or --allow-fork" advice output from "fossil checkin" when forcing the checkin would fork the branch. It's good for Fossil to have this option, especially for automated tooling that needs to just bull forward blindly, but it's bad advice to give to interactive users. Let them discover it via --help, if they learn of it at all. ... (check-in: 66d55e9b user: wyoung tags: trunk) | |
| 19:03 | Expanded on the rules for literal/verbatim/fenced text in the /md_rules document. ... (check-in: 1b2d6c30 user: wyoung tags: trunk) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
2270 2271 2272 2273 2274 2275 2276 |
** or --force flags is used, or unless this is a private check-in.
** The initial commit MUST have tags "trunk" and "sym-trunk".
*/
if( !vid ){
if( sCiInfo.zBranch==0 ){
if( allowFork==0 && forceFlag==0 && g.markPrivate==0
&& db_exists("SELECT 1 from event where type='ci'") ){
| | | | 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 |
** or --force flags is used, or unless this is a private check-in.
** The initial commit MUST have tags "trunk" and "sym-trunk".
*/
if( !vid ){
if( sCiInfo.zBranch==0 ){
if( allowFork==0 && forceFlag==0 && g.markPrivate==0
&& db_exists("SELECT 1 from event where type='ci'") ){
fossil_fatal("would fork. \"update\" first.");
}
sCiInfo.zBranch = db_get("main-branch", "trunk");
}
}else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0
&& g.markPrivate==0 && !is_a_leaf(vid)
){
fossil_fatal("would fork. \"update\" first.");
}
/*
** Do not allow a commit against a closed leaf unless the commit
** ends up on a different branch.
*/
if(
|
| ︙ | ︙ |