|
Size: 743
Comment: Be clearer about one vs. two parent revisions.
|
Size: 1026
Comment: lowercase links
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| 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. | The '''working directory''' is the top-level directory in a [:Repository: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:tip], but may be from older [:Revision:revisions], or modified and not yet [:Commit:committed]. |
| Line 5: | Line 5: |
| 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 has one or two [:Parent: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:local modifications]. An [:Update:update] will change the parent revision, whereas a [:Revert:revert] will only modify the content of the working directory. |
| Line 11: | Line 7: |
| A working directory will only have two parent revisions as the result of a ["Merge"]. | A working directory will only have two parent revisions as the result of a [:Merge:merge]. A [:NamedBranches:branch name] can be set for the working directory. It’s useful to think of the working directory as "the [:ChangeSet:changeset] I’m about to commit". ---- CategoryGlossary |
Working directory
The working directory is the top-level directory in a [:Repository: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:tip], but may be from older [:Revision:revisions], or modified and not yet [:Commit:committed].
A working directory has one or two [:Parent: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:local modifications]. An [:Update:update] will change the parent revision, whereas a [:Revert: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:merge].
A [:NamedBranches:branch name] can be set for the working directory.
It’s useful to think of the working directory as "the [:ChangeSet:changeset] I’m about to commit".