Diff for "WorkingDirectory"

Differences between revisions 1 and 3 (spanning 2 versions)

Working directory

The working directory is the top-level directory in a Repository, in which the plain versions of files are available to read, edit and build. Files in the working directory are usually from the ["Tip"], but may be from older revisions, or modified and not yet ["Commit"]ted.

A working directory has one or two parent revisions. The parent revision or revisions will become the parent revisions of the new revision which will eventually be created by a ["Commit"] of the ["LocalModifications"]. An ["Update"] will change the parent revision, whereas a ["Revert"] will only modify the content of the working directory.

A working directory will only have two parent revisions as the result of a ["Merge"].

-  ⇤ ← Revision 1 as of 2005-08-26 00:57:54 → 
  Size: 304
  Editor: waste
  Comment:
+   ← Revision 3 as of 2006-05-09 00:05:00 → ⇥
  Size: 743
  Editor: EricHopper
  Comment: Be clearer about one vs. two parent revisions.
-Deletions are marked like this.
+Additions are marked like this.
 Line 4:
+A working directory has one or two parent revisions.  The parent revision or revisions will become
the parent revisions of the new revision which will eventually be created by a ["Commit"]
of the ["LocalModifications"].
An ["Update"] will change the parent revision, whereas a ["Revert"] will only modify
the content of the working directory.

A working directory will only have two parent revisions as the result of a ["Merge"].