Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Added a generaliation of the prior edit to www/branching.wiki |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
3cc437a50ffe8c6d75b0d404ef3d80ca |
| User & Date: | wyoung 2019-06-19 17:33:43 |
Context
|
2019-06-19
| ||
| 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 | |
Changes
Changes to www/branching.wiki.
217 218 219 220 221 222 223 224 225 226 227 228 229 230 |
That leaves only one case where we can recommend use of "--allow-fork" by interactive users, while autosync is enabled: when you're working on a personal branch so that creating a dual-tipped branch isn't going to cause any other user an inconvenience or risk forking the development. This is a good alternative to branching when you just need to temporarily fork the branch's development. <h2 id="tags">Tags And Properties</h2> Tags and properties are used in Fossil to help express the intent, and thus to distinguish between forks and branches. Figure 5 shows the same scenario as Figure 4 but with tags and properties added: |
> > > > |
217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 |
That leaves only one case where we can recommend use of "--allow-fork" by interactive users, while autosync is enabled: when you're working on a personal branch so that creating a dual-tipped branch isn't going to cause any other user an inconvenience or risk forking the development. This is a good alternative to branching when you just need to temporarily fork the branch's development. There's a common generalization of that case: you're a solo developer, so that the problems with braching vs forking simply don't matter. In that case, feel free to use "--allow-fork" as much as you like. <h2 id="tags">Tags And Properties</h2> Tags and properties are used in Fossil to help express the intent, and thus to distinguish between forks and branches. Figure 5 shows the same scenario as Figure 4 but with tags and properties added: |