Fossil SCM
More update/checkout doc additions.
Commit
3f8b6efa2f9c57b124949f95a2c433ee83c051c0
Parent
bfdabaecc8d7a9c…
1 file changed
+17
-1
+17
-1
| --- www/quickstart.wiki | ||
| +++ www/quickstart.wiki | ||
| @@ -121,11 +121,18 @@ | ||
| 121 | 121 | separate directories from the same repository. This enables you, |
| 122 | 122 | for example, to do builds from multiple branches or versions at |
| 123 | 123 | the same time without having to generate extra clones.</p> |
| 124 | 124 | |
| 125 | 125 | <p>To switch a checkout between different versions and branches, |
| 126 | - use the [/help/checkout | checkout] or [/help/update | update] | |
| 126 | + use:</p> | |
| 127 | + | |
| 128 | + <blockquote> | |
| 129 | + <b>[/help/update | fossil update]</b><br> | |
| 130 | + <b>[/help/checkout | fossil checkout]</b><br> | |
| 131 | + </blockquote> | |
| 132 | + | |
| 133 | + <p>The [/help/checkout | checkout] or [/help/update | update] | |
| 127 | 134 | commands. [/help/update | update] honors the "autosync" option |
| 128 | 135 | and does a "soft" switch, merging any local changes into the |
| 129 | 136 | target version, whereas [/help/checkout | checkout] does not |
| 130 | 137 | sync and does a "hard" switch, potentially overwriting local |
| 131 | 138 | changes (after prompting).</p> |
| @@ -235,10 +242,19 @@ | ||
| 235 | 242 | when you run [/help/update|update] and a [/help/push|push] happens |
| 236 | 243 | automatically after you [/help/commit|commit]. So in normal practice, |
| 237 | 244 | the push, pull, and sync commands are rarely used. But it is important |
| 238 | 245 | to know about them, all the same.</p> |
| 239 | 246 | |
| 247 | + <blockquote> | |
| 248 | + <b>[/help/checkout | fossil checkout]</b> <i>VERSION</i> | |
| 249 | + </blockquote> | |
| 250 | + | |
| 251 | + <p>Is similar to update except that it does not honor the autosync | |
| 252 | + setting, nor does it merge in local changes - it prefers to overwrite | |
| 253 | + them and fails if local changes exist unless the <tt>--force</tt> | |
| 254 | + flag is used.</p> | |
| 255 | + | |
| 240 | 256 | <h2>Branching And Merging</h2> |
| 241 | 257 | |
| 242 | 258 | <p>Use the --branch option to the [/help/commit | commit] command |
| 243 | 259 | to start a new branch. Note that in Fossil, branches are normally |
| 244 | 260 | created when you commit, not before you start editing. You can |
| 245 | 261 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -121,11 +121,18 @@ | |
| 121 | separate directories from the same repository. This enables you, |
| 122 | for example, to do builds from multiple branches or versions at |
| 123 | the same time without having to generate extra clones.</p> |
| 124 | |
| 125 | <p>To switch a checkout between different versions and branches, |
| 126 | use the [/help/checkout | checkout] or [/help/update | update] |
| 127 | commands. [/help/update | update] honors the "autosync" option |
| 128 | and does a "soft" switch, merging any local changes into the |
| 129 | target version, whereas [/help/checkout | checkout] does not |
| 130 | sync and does a "hard" switch, potentially overwriting local |
| 131 | changes (after prompting).</p> |
| @@ -235,10 +242,19 @@ | |
| 235 | when you run [/help/update|update] and a [/help/push|push] happens |
| 236 | automatically after you [/help/commit|commit]. So in normal practice, |
| 237 | the push, pull, and sync commands are rarely used. But it is important |
| 238 | to know about them, all the same.</p> |
| 239 | |
| 240 | <h2>Branching And Merging</h2> |
| 241 | |
| 242 | <p>Use the --branch option to the [/help/commit | commit] command |
| 243 | to start a new branch. Note that in Fossil, branches are normally |
| 244 | created when you commit, not before you start editing. You can |
| 245 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -121,11 +121,18 @@ | |
| 121 | separate directories from the same repository. This enables you, |
| 122 | for example, to do builds from multiple branches or versions at |
| 123 | the same time without having to generate extra clones.</p> |
| 124 | |
| 125 | <p>To switch a checkout between different versions and branches, |
| 126 | use:</p> |
| 127 | |
| 128 | <blockquote> |
| 129 | <b>[/help/update | fossil update]</b><br> |
| 130 | <b>[/help/checkout | fossil checkout]</b><br> |
| 131 | </blockquote> |
| 132 | |
| 133 | <p>The [/help/checkout | checkout] or [/help/update | update] |
| 134 | commands. [/help/update | update] honors the "autosync" option |
| 135 | and does a "soft" switch, merging any local changes into the |
| 136 | target version, whereas [/help/checkout | checkout] does not |
| 137 | sync and does a "hard" switch, potentially overwriting local |
| 138 | changes (after prompting).</p> |
| @@ -235,10 +242,19 @@ | |
| 242 | when you run [/help/update|update] and a [/help/push|push] happens |
| 243 | automatically after you [/help/commit|commit]. So in normal practice, |
| 244 | the push, pull, and sync commands are rarely used. But it is important |
| 245 | to know about them, all the same.</p> |
| 246 | |
| 247 | <blockquote> |
| 248 | <b>[/help/checkout | fossil checkout]</b> <i>VERSION</i> |
| 249 | </blockquote> |
| 250 | |
| 251 | <p>Is similar to update except that it does not honor the autosync |
| 252 | setting, nor does it merge in local changes - it prefers to overwrite |
| 253 | them and fails if local changes exist unless the <tt>--force</tt> |
| 254 | flag is used.</p> |
| 255 | |
| 256 | <h2>Branching And Merging</h2> |
| 257 | |
| 258 | <p>Use the --branch option to the [/help/commit | commit] command |
| 259 | to start a new branch. Note that in Fossil, branches are normally |
| 260 | created when you commit, not before you start editing. You can |
| 261 |