|
Size: 839
Comment: Using DirState
|
Size: 850
Comment: converted to 1.6 markup
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| The '''local modifications''' in a [:WorkingDirectory:working directory] are the differences existing between the files in the working directory compared to their [:Parent:parent] file [:Revision:revisions] in the [:Repository:repository] and all added, moved, removed or renamed files. | The '''local modifications''' in a [[WorkingDirectory|working directory]] are the differences existing between the files in the working directory compared to their [[Parent|parent]] file [[Revision|revisions]] in the [[Repository|repository]] and all added, moved, removed or renamed files. |
| Line 5: | Line 5: |
| Those differences can be displayed by a [:Diff:diff]. | Those differences can be displayed by a [[Diff|diff]]. |
| Line 7: | Line 7: |
| [:Commit: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. | [[Commit|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 9: | Line 9: |
| If the working directory has two [:Parent:parent] revisions (due to a [:Merge:merge]), the local modifications will correspond to the resolution of the [:Conflict:conflicts]. | If the working directory has two [[Parent|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 a 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.