Not logged in
Diff

Differences From Artifact [44bd9b89f6]:

  • File www/concepts.wiki — part of check-in [3c1234c0f2] at 2009-09-12 17:45:00 on branch trunk — More documentation updates. (user: drh size: 20110)

To Artifact [846a2562a2]:

  • File www/concepts.wiki — part of check-in [7879c250fb] at 2009-09-12 20:42:01 on branch trunk — More documentation clarifications. (user: drh size: 20027) [more...]

249
250
251
252
253
254
255
256

257
258
259
260
261
262
263
264
265

266

267
268
269
270
271
272
273
249
250
251
252
253
254
255

256

257
258
259
260
261
262
263
264
265

266
267
268
269
270
271
272
273







-
+
-








+
-
+







<li>
Establish a local repository using either the <b>new</b> command
to start a new project, or the <b>clone</b> command to make a clone
of a repository for an existing project. 
</li>

<li>
Establish one or more source trees by changing your working directory
Establish one or more source trees using
to where you want the root of the source tree to be, then issuing
the <b>open</b> command with the name of the repository file as its
argument.
</li>

<li>
The <b>open</b> command in the previous step populates your local source
tree with a copy of the latest check-in.  Usually this is what you want.
In the rare cases where it is not, use the <b>update</b> command to
switch to a different check-in.  
switch to a new check-in.  Use the <b>timeline</b> or <b>leaves</b> commands
Use the <b>timeline</b> or <b>leaves</b> commands
to identify alternative check-ins to switch to.
</li>

<li>
Edit the code.  Add new files to the source tree using the <b>add</b>
command.  Omit files from future check-ins using the <b>rm</b> command.
(Even when you remove files from future check-ins, those files continue
324
325
326
327
328
329
330

331

332
333
334
335
336
337
338
324
325
326
327
328
329
330
331

332
333
334
335
336
337
338
339







+
-
+







argument.
</li>

<li>
The <b>open</b> command in the previous step populates your local source
tree with a copy of the latest check-in.  Usually this is what you want.
In the rare cases where it is not, use the <b>update</b> command to
switch to a different check-in.
switch to a new check-in.  Use the <b>timeline</b> or <b>leaves</b> commands
Use the <b>timeline</b> or <b>leaves</b> commands
to identify alternative check-ins to switch to.
</li>

<li>
Edit the code.  Add new files to the source tree using the <b>add</b>
command.  Omit files from future check-ins using the <b>rm</b> command.
(Even when you remove files from future check-ins, those files continue
363
364
365
366
367
368
369
370

371
372
373
374
375
376
377
364
365
366
367
368
369
370

371
372
373
374
375
376
377
378







-
+







use the <b>update</b> command to merge them to your local source tree.
If you merge in some changes and find that the changes do not work out
or are not to your liking, you can back out the changes using the
<b>undo</b> command.
</li>

<li>
If two or more people ran "commit" against the same baseline, this will
If two or more people ran "commit" against the same check-in, this will
result in a [./branching.wiki | fork] which you may want to resolve by
running <b>merge</b> followed by another <b>commit</b>.
</li>

<li>
Repeat all of the above until you have generated great software.
</li>