|
Size: 553
Comment: +cat
|
Size: 638
Comment: lowercase links, rewording
|
| 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:parent] file [:Revision:revisions] in the [:Repository:repository]. |
| Line 7: | Line 5: |
| Those differences can be displayed by a ["Diff"]. | Those differences can be displayed by a [:Diff:diff]. |
| Line 9: | Line 7: |
| If those local modifications are committed, they will become a new ChangeSet. |
[:Commit:Committing] these local modifications produces a new [:ChangeSet:changeset] in the repository. |
| 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: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 [: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].
Those differences can be displayed by a [:Diff:diff].
[:Commit:Committing] these local modifications produces a new [:ChangeSet:changeset] in the repository.
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].