Fossil

Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

50 check-ins occurring around 6c2cf0571a45d6d1.

2019-06-30
11:36
Rename the --save-password option on "fossil clone" to --save-http-password, since it only works for HTTP. ... (check-in: 22517bab user: drh tags: trunk)
04:27
Update the change log and the sync protocol documentation for the new check-in locking mechanism that tries to prevent race-condition forks. ... (check-in: 2d7a8a83 user: drh tags: trunk)
03:38
In the "fossil diff" command, the use of --tclsh implies --tk. ... (check-in: 2655a2d4 user: drh tags: trunk)
2019-06-29
10:21
Add the --tclsh command to "fossil diff" in order to specify an alternative TCL interpreter. ... (check-in: 9fc945c0 user: drh tags: trunk)
03:17
Steps to prevent accidental forks during a commit when two users try to commit to the same parent at the same time. The first user to do the autosync pull takes a lock which causes the second user to get a "would fork" error, unless the --allow-fork or --force options are used. ... (check-in: 03cc3329 user: drh tags: trunk)
03:14
Add the --save-password option to "fossil clone". Put the command-line options for "fossil clone" in alphabetical order. ... (check-in: 421e6bb3 user: drh tags: trunk)
03:13
For "fossil clone help", put options in alphabetical order. ... (Closed-Leaf check-in: d5c6f478 user: drh tags: save-http-url-password)
03:11
Change the name of the option to just --save-password. ... (check-in: 76e158ad user: drh tags: save-http-url-password)
03:08
Enhance the "fossil tag ls" command to allow filtering by tag type. ... (check-in: 971a1a99 user: drh tags: trunk)
2019-06-28
07:23
Added the --save-http-url-password option to the clone command to make it skip the "remember password (Y/n)?" prompt if the password was given in an HTTP URL. We avoid this for ssh:// URLs since you have pre-shared keys, SSH agents, and such to avoid the need in that case. Without this feature, you can't script around it by piping "echo y" through the command because the "remember password" feature as of trunk only works when isatty(0), which will be false when Fossil is downstream from a pipe like that. ... (check-in: 2600b771 user: wyoung tags: save-http-url-password)
2019-06-27
23:37
Small fixes to branching.wiki ... (check-in: cdd5e576 user: wyoung tags: trunk)
23:12
Assorted improvements to the new material in www/branching.wiki, mainly in the way of clarifications and moderation of tone. ... (check-in: 862b77b6 user: wyoung tags: trunk)
14:39
Upgrade to openssl 1.1.1c. Use single-argument "expr" in auto.def. Update custom mingw makefile. ... (check-in: 50501328 user: jan.nijtmans tags: trunk)
03:54
Because the sync status updates all occur on the same line make this client warning show up on its own line so the output doesn't get cluttered. ... (Closed-Leaf check-in: 82d69e7f user: andybradford tags: no-race-commit)
2019-06-22
16:57
Enhance the "fossil tag ls" command to allow filtering by tag type. ... (Closed-Leaf check-in: 2d3025ad user: andybradford tags: taglist-tagtype)
14:54
When doing a commit with autosync enabled, the first autosync now takes a temporary (24-hour) lock on the baseline commit in order to prevent any other connected user from simultaneously committing and creating an accidental fork. ... (check-in: 222fc681 user: drh tags: no-race-commit)
03:46
More clarifications in the "How Can Forks Divide Development Effort?" section of branching.wiki, primarily in explaining how each user in the example arrives at the view shown in the swim lane diagram. There were multiple implicit possilibities before, and some were misinterpreting it. ... (check-in: 70a7db80 user: wyoung tags: trunk)
2019-06-21
13:19
Gave Users A thru E human names, and humanized their story a bit in the branching.wiki article. ... (check-in: 2ac5bc3c user: wyoung tags: trunk)
12:58
Moved check-ins 3 and later right in the Figure 6 swim lane diagram within branching.wiki so that there is only one event at each time step. As previously drawn, it implied that check-ins 2 and 3 occurred at the same time, but that's neither true nor necessary to our point here. Also evened up the lane widths. ... (check-in: 856c9565 user: wyoung tags: trunk)
12:41
Fixed an alignment problem in Figure 6 of branching.wiki, and clarified the "back online" step in User C's lane. ... (check-in: 8c44fd2b user: wyoung tags: trunk)
12:26
Typo fix ... (check-in: eed1ff61 user: wyoung tags: trunk)
12:20
Better internal links in www/branching.wiki to the new "How Can Forks Divide Development Effort?" section. Also added a Wikipedia link for "DVCS". ... (check-in: ed447529 user: wyoung tags: trunk)
12:09
Clarified User C's view of the bad-fork situation in branching.wiki. ... (check-in: 8a794a5d user: wyoung tags: trunk)
12:04
More clarity improvements and typo fix in branching.wiki ... (check-in: c16f7cb6 user: wyoung tags: trunk)
12:01
Typo fix ... (check-in: d696febb user: wyoung tags: trunk)
11:57
Small tweaks to previous ... (check-in: 6c2cf057 user: wyoung tags: trunk)
11:50
Clarified the "it doesn't matter how or why" in the previous check-in. ... (check-in: 9aec1718 user: wyoung tags: trunk)
11:45
Added "How Can Forks Divide Development Effort?" section to www/branching.wiki. ... (check-in: efb104bb user: wyoung tags: trunk)
2019-06-20
17:02
Replaced a mailing list reference with a forum link (reported by a forum user). ... (check-in: 8ddeb17d user: stephan tags: trunk)
16:46
Put --allow-fork back into the fossil ci "would fork" message. Everyone's unhappy now. :) ... (check-in: acb5324c user: wyoung tags: trunk)
16:40
Removed "The Author's Voice" from www/branching.wiki due to multiple complaints. ... (check-in: 1926d1d5 user: wyoung tags: trunk)
13:32
Added new section, "The Authors' Voice" to www/branching.wiki. Other assorted improvements as well. ... (check-in: 2da10998 user: wyoung tags: trunk)
11:30
Markdownism fix in a Wiki-formatted doc ... (check-in: cbca374c user: wyoung tags: trunk)
11:10
Added the section "Fixing Forks" to www/branching.wiki, and added an explanatory paragraph about the intentionality of forking. ... (check-in: 2686bad1 user: wyoung tags: trunk)
2019-06-19
18:45
Added a new section, "Branch Names Need Not Be Unique" to www/branching.wiki. ... (check-in: 42bfe936 user: wyoung tags: trunk)
18:24
Added a link to https://fossil-scm.org/fossil/doc/trunk/www/branching.wiki#branching from the recent changes to the fossil ci "would fork" error message. *Hopefully* this will end the debate. ... (check-in: b761a729 user: wyoung tags: trunk)
18:09
Several expansions on the new points in www/branching.wiki ... (check-in: bf048cd5 user: wyoung tags: trunk)
18:01
Typo fix ... (check-in: 184cf208 user: wyoung tags: trunk)
17:59
Fixed a command in the previoius checkin ... (check-in: d5e1e113 user: wyoung tags: trunk)
17:58
More expansion on the discussion of creating branches in Fossil, especially in the second-form commands, which were incomplete in the prior version. ... (check-in: 73911668 user: wyoung tags: trunk)
17:41
Added the key distinction ("A branch is a named, intentional fork") to www/branching.wiki and added info on actually creating branches. ... (check-in: 1e0cf467 user: wyoung tags: trunk)
17:33
Added a generaliation of the prior edit to www/branching.wiki ... (check-in: 3cc437a5 user: wyoung tags: trunk)
17:13
Expanded on the discussion of forking vs branching in www/branching.wiki. ... (check-in: b882c623 user: wyoung tags: trunk)
16:58
Removed other Figures' graphs from www/branch0*.graphml left from the breaking up of www/branching.graphml. ... (check-in: e3c55977 user: wyoung tags: trunk)
16:57
Removed www/branching.graphml: that was accidentally checked in. (The diagrams started out in a single yEd document, but I later decided to make them separate documents, and forgot to remove this from the local filesystem before saying "fossil add www/bra*".) ... (check-in: 85da145e user: wyoung tags: trunk)
16:56
Fixed numbering of node 6 in the new SVG/yEd branching diagrams. ... (check-in: 5011b202 user: wyoung tags: trunk)
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)
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)