|
Size: 644
Comment:
|
Size: 743
Comment: Be clearer about one vs. two parent revisions.
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 5: | Line 5: |
| A working directory has one parent revision, eventually two. These revisions will become | A working directory has one or two parent revisions. The parent revision or revisions will become |
| Line 10: | Line 10: |
A working directory will only have two parent revisions as the result of a ["Merge"]. |
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"].