Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
15 check-ins going from 8dcf4ffce1 to 2686bad19a
|
2019-06-20
| ||
| 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) | |