Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | 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. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8dcf4ffce1a74d19bbe7bcce72b1aa74 |
| User & Date: | wyoung 2019-06-18 01:48:05 |
Context
|
2019-06-19
| ||
| 16:22 | Replaced the GIFs in www/branching.wiki with yEd diagrams and SVGs exported from them. This allows scalability on various screen sizes, avoids crunchy pixelated edges, allows editing, and saves space on the wire. ... (check-in: 00aded16 user: wyoung tags: trunk) | |
|
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) | |
|
2019-06-17
| ||
| 07:09 | The touch command no longer treats missing files as a fatal error, instead emitting a warning message. ... (check-in: 56530e9b user: stephan 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 or use --branch.");
}
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 or use --branch.");
}
/*
** Do not allow a commit against a closed leaf unless the commit
** ends up on a different branch.
*/
if(
|
| ︙ | ︙ |