|
Size: 553
Comment: +cat
|
← Revision 13 as of 2012-11-06 16:09:22 ⇥
Size: 819
Comment: link to Cmd:diff instead of deleted page "Diff"
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| The local modifications in a WorkingDirectory are the differences existing between the files content on the filesystem and the files content in the ["Repository"] at the ["Parent"] revision. |
The '''local modifications''' in a [[WorkingDirectory|working directory]] are the differences existing between the files in the working directory compared to their parent file [[Revision|revisions]] in the [[Repository|repository]] and all added, moved, removed or renamed files. |
| Line 7: | Line 5: |
| Those differences can be displayed by a ["Diff"]. | Those differences can be displayed by [[Cmd:diff|diff]]. |
| Line 9: | Line 7: |
| If those local modifications are committed, they will become a new ChangeSet. |
Committing these local modifications produces a new [[ChangeSet|changeset]] in the repository. Mercurial uses the [[DirState|dirstate]] to quickly determine what files in the working directory have changed and thus need to be included in the commit. |
| Line 12: | Line 9: |
| When the working directory has two ["Parent"] revisions as the result of a ["Merge"], the local modifications will correspond to the resolution of the ["Conflict"]s. |
If the working directory has two parent revisions (due to a [[Merge|merge]]), the local modifications will correspond to the resolution of the [[Conflict|conflicts]]. |
Local Modifications
The local modifications in a working directory are the differences existing between the files in the working directory compared to their parent file revisions in the repository and all added, moved, removed or renamed files.
Those differences can be displayed by diff.
Committing these local modifications produces a new changeset in the repository. Mercurial uses the dirstate to quickly determine what files in the working directory have changed and thus need to be included in the commit.
If the working directory has two parent revisions (due to a merge), the local modifications will correspond to the resolution of the conflicts.