Fossil

Check-in [3f8b6efa]
Login

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

Overview
Comment:More update/checkout doc additions.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:3f8b6efa2f9c57b124949f95a2c433ee83c051c0
User & Date: stephan 2014-03-21 10:20:16
Context
2014-03-21
10:23
fixed a small lie. check-in: 0829160c user: stephan tags: trunk
10:20
More update/checkout doc additions. check-in: 3f8b6efa user: stephan tags: trunk
10:08
Cherry-pick SQLite 01944c53f5: Fix the EXPLAIN indenter in the command-line shell to correctly handle NextIfOpen and PrevIfOpen opcodes. check-in: bfdabaec user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/quickstart.wiki.

119
120
121
122
123
124
125







126
127
128
129
130
131
132
133
...
233
234
235
236
237
238
239









240
241
242
243
244
245
246

    <p>Note that Fossil allows you to make multiple check-outs in
    separate directories from the same repository.  This enables you,
    for example, to do builds from multiple branches or versions at 
    the same time without having to generate extra clones.</p>

    <p>To switch a checkout between different versions and branches,







    use the [/help/checkout | checkout] or [/help/update | update]
    commands. [/help/update | update] honors the "autosync" option
    and does a "soft" switch, merging any local changes into the
    target version, whereas [/help/checkout | checkout] does not
    sync and does a "hard" switch, potentially overwriting local
    changes (after prompting).</p>

<h2>Configuring Your Local Repository</h2>
................................................................................
    <p>The default behavior is for [./concepts.wiki#workflow|autosync] to
    be turned on.  That means that a [/help/pull|pull] automatically occurs
    when you run [/help/update|update] and a [/help/push|push] happens 
    automatically after you [/help/commit|commit].  So in normal practice,
    the push, pull, and sync commands are rarely used.  But it is important
    to know about them, all the same.</p>










<h2>Branching And Merging</h2>

    <p>Use the --branch option to the [/help/commit | commit] command
    to start a new branch.  Note that in Fossil, branches are normally
    created when you commit, not before you start editing.  You can
    use the [/help/branch | branch new] command to create a new branch
    before you start editing, if you want, but most people just wait







>
>
>
>
>
>
>
|







 







>
>
>
>
>
>
>
>
>







119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
...
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262

    <p>Note that Fossil allows you to make multiple check-outs in
    separate directories from the same repository.  This enables you,
    for example, to do builds from multiple branches or versions at 
    the same time without having to generate extra clones.</p>

    <p>To switch a checkout between different versions and branches,
    use:</p>

    <blockquote>
    <b>[/help/update | fossil update]</b><br>
    <b>[/help/checkout | fossil checkout]</b><br>
    </blockquote>

    <p>The [/help/checkout | checkout] or [/help/update | update]
    commands. [/help/update | update] honors the "autosync" option
    and does a "soft" switch, merging any local changes into the
    target version, whereas [/help/checkout | checkout] does not
    sync and does a "hard" switch, potentially overwriting local
    changes (after prompting).</p>

<h2>Configuring Your Local Repository</h2>
................................................................................
    <p>The default behavior is for [./concepts.wiki#workflow|autosync] to
    be turned on.  That means that a [/help/pull|pull] automatically occurs
    when you run [/help/update|update] and a [/help/push|push] happens 
    automatically after you [/help/commit|commit].  So in normal practice,
    the push, pull, and sync commands are rarely used.  But it is important
    to know about them, all the same.</p>

    <blockquote>
    <b>[/help/checkout | fossil checkout]</b> <i>VERSION</i>
    </blockquote>

    <p>Is similar to update except that it does not honor the autosync
    setting, nor does it merge in local changes - it prefers to overwrite
    them and fails if local changes exist unless the <tt>--force</tt>
    flag is used.</p>

<h2>Branching And Merging</h2>

    <p>Use the --branch option to the [/help/commit | commit] command
    to start a new branch.  Note that in Fossil, branches are normally
    created when you commit, not before you start editing.  You can
    use the [/help/branch | branch new] command to create a new branch
    before you start editing, if you want, but most people just wait