Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 events occurring around 1e0cf46762168ab9.
|
2019-06-22
| ||
| 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: 70a7db80f5 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: 2ac5bc3c30 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: 856c95654b 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: 8c44fd2baa user: wyoung tags: trunk) | |
| 12:26 | Typo fix ... (check-in: eed1ff610b 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: ed44752990 user: wyoung tags: trunk) | |
| 12:09 | Clarified User C's view of the bad-fork situation in branching.wiki. ... (check-in: 8a794a5dab user: wyoung tags: trunk) | |
| 12:04 | More clarity improvements and typo fix in branching.wiki ... (check-in: c16f7cb67c user: wyoung tags: trunk) | |
| 12:01 | Typo fix ... (check-in: d696febb04 user: wyoung tags: trunk) | |
| 11:57 | Small tweaks to previous ... (check-in: 6c2cf0571a user: wyoung tags: trunk) | |
| 11:50 | Clarified the "it doesn't matter how or why" in the previous check-in. ... (check-in: 9aec171853 user: wyoung tags: trunk) | |
| 11:45 | Added "How Can Forks Divide Development Effort?" section to www/branching.wiki. ... (check-in: efb104bbb1 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: 8ddeb17d86 user: stephan tags: trunk) | |
| 16:46 | Put --allow-fork back into the fossil ci "would fork" message. Everyone's unhappy now. :) ... (check-in: acb5324c79 user: wyoung tags: trunk) | |
| 16:40 | Removed "The Author's Voice" from www/branching.wiki due to multiple complaints. ... (check-in: 1926d1d5b3 user: wyoung tags: trunk) | |
| 13:32 | Added new section, "The Authors' Voice" to www/branching.wiki. Other assorted improvements as well. ... (check-in: 2da109981a user: wyoung tags: trunk) | |
| 11:30 | Markdownism fix in a Wiki-formatted doc ... (check-in: cbca374c37 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: 2686bad19a 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: 42bfe9362a 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: b761a72922 user: wyoung tags: trunk) | |
| 18:09 | Several expansions on the new points in www/branching.wiki ... (check-in: bf048cd576 user: wyoung tags: trunk) | |
| 18:01 | Typo fix ... (check-in: 184cf2087a user: wyoung tags: trunk) | |
| 17:59 | Fixed a command in the previoius checkin ... (check-in: d5e1e113ef 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: 7391166893 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: 1e0cf46762 user: wyoung tags: trunk) | |
| 17:33 | Added a generaliation of the prior edit to www/branching.wiki ... (check-in: 3cc437a50f user: wyoung tags: trunk) | |
| 17:13 | Expanded on the discussion of forking vs branching in www/branching.wiki. ... (check-in: b882c62386 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: e3c55977e2 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: 85da145ecb user: wyoung tags: trunk) | |
| 16:56 | Fixed numbering of node 6 in the new SVG/yEd branching diagrams. ... (check-in: 5011b20264 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: 00aded1601 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: 8dcf4ffce1 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: 56530e9b6d 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: 847423edfa 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: 66d55e9b43 user: wyoung tags: trunk) | |
| 19:03 | Expanded on the rules for literal/verbatim/fenced text in the /md_rules document. ... (check-in: 1b2d6c30ba user: wyoung tags: trunk) | |
| 17:58 | Adding a simulation (www/collisions.ipynb) for checkin collisions over a working day, given parameters like number of checkins per day. This is in support of discussion on the forum centering on this post: https://fossil-scm.org/forum/forumpost/7349f4b6e1 ... (check-in: 950e54ef35 user: wyoung tags: trunk) | |
|
2019-06-14
| ||
| 19:16 | Per forum discussion: when the calculated timestamp of a to-be-touched file is 0, emit a warning and do not set the timestamp. As-yet-uncommitted merges can cause mtime_of_manifest_file() to calculate a time of zero: https://fossil-scm.org/forum/forumpost/6e49ee3725 ... (check-in: 29f450a532 user: stephan tags: trunk) | |
| 00:24 | Error message typo fix. ... (check-in: 5b6be64760 user: stephan tags: trunk) | |
|
2019-06-13
| ||
| 21:49 | It turns out that fossil globally consumes the --quiet flag: touch now accounts for that. ... (check-in: 519af48c8c user: stephan tags: trunk) | |
| 21:28 | Minor reformatting, doc updates, and corrected duplicate display of touched file count in dry-run mode. ... (check-in: adbbeac151 user: stephan tags: trunk) | |
| 20:20 | Reworded misleading statements in the "touch" help. ... (check-in: ad275f975c user: stephan tags: trunk) | |
| 20:12 | Reworked the "touch" command to be able to handle non-glob filenames. ... (check-in: 1b49ab3c6c user: stephan tags: trunk) | |
| 14:10 | Update the built-in SQLite to the latest 3.29.0 alpha that includes compiler warning fixes. ... (check-in: 7b7f5df891 user: drh tags: trunk) | |
| 10:32 | Add an entry about the new "touch" command and "--setmtime" option to the change log for version 2.9. ... (check-in: 93a6893d45 user: drh tags: trunk) | |
| 10:15 | Per forum discussion, the "touch" command now defaults to --now (the current timestamp) unless --checkin is used, which applies the timestamp of the most recent checkin in which each file was modified. ... (check-in: c3b48561ab user: stephan tags: trunk) | |
| 09:00 | Update the copyTextToClipboard() javascript routine to work better cross-platform. ... (check-in: 0904aa8b10 user: drh tags: trunk) | |
| 08:58 | Add the --setmtime option to the "checkout" and "open" commands. Add a new "touch" command that does nothing but run --setmtime on all named files. ... (check-in: a7e86f5b18 user: drh tags: trunk) | |
| 08:20 | Help text improvements. ... (Closed-Leaf check-in: c5521b6429 user: stephan tags: touch-command) | |
| 08:13 | Help text typo. ... (check-in: 85e3340b37 user: stephan tags: touch-command) | |