Diff for "LocalModifications"

Differences between revisions 2 and 13 (spanning 11 versions)

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.

CategoryGlossary

-  ⇤ ← Revision 2 as of 2007-02-06 19:48:00 → 
  Size: 6532
  Editor: 219-88-100-42
  Comment:
+   ← Revision 13 as of 2012-11-06 16:09:22 → ⇥
  Size: 819
  Editor: abuehl
  Comment: link to Cmd:diff instead of deleted page "Diff"
-Deletions are marked like this.
+Additions are marked like this.
 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.
 [http://homepage.mac.com/annealed/29.html msn webcam hack] | [http://homepage.mac.com/squarish/12.html webcam girl strip] | [http://homepage.mac.com/squarish/3.html free webcam site] | [http://homepage.mac.com/leitmotif1/29.html webcam hot] | [http://homepage.mac.com/allegation/85.html webcam babes] | [http://homepage.mac.com/knob10/24.html free lesbian webcams] | [http://homepage.mac.com/shy3/27.html live adult webcam] | [http://homepage.mac.com/entrenches/52.html webcam flashers] | [http://homepage.mac.com/gruffer1/71.html masturbating webcam] | [http://homepage.mac.com/allegation/75.html boobs on webcam] | [http://homepage.mac.com/knob10/56.html wife webcam] | [http://homepage.mac.com/bowlfuls/89.html voyeur webcams] | [http://homepage.mac.com/absurd2/83.html public webcams] | [http://homepage.mac.com/bowlfuls/94.html webcam teens personal] | [http://homepage.mac.com/bowlfuls/56.html self nude webcam] | [http://homepage.mac.com/subcranial/55.html webcam free striptease] | [http://homepage.mac.com/squarish/2.html webcam strip] | [http://homepage.mac.com/gruffer1/70.html gay webcam] | [http://homepage.mac.com/calibre2/29.html casino webcam online] | [http://homepage.mac.com/annealed/65.html msn webcams] | [http://homepage.mac.com/petrarchan/23.html live adult webcam] | [http://homepage.mac.com/subcranial/57.html lesbian webcam] | [http://homepage.mac.com/gongs1/22.html teen striptease webcam] | [http://homepage.mac.com/corsica4/34.html live free webcam] | [http://homepage.mac.com/calibre2/14.html movies webcam swinger] | [http://homepage.mac.com/dogtired1/43.html webcam girls apartment] | [http://homepage.mac.com/pericles4/56.html young webcam babes] | [http://homepage.mac.com/annealed/33.html hidden webcam] | [http://homepage.mac.com/pericles4/17.html webcam strip] | [http://homepage.mac.com/fagoting/79.html nude webcams] | [http://homepage.mac.com/bowlfuls/60.html webcam fantasies] | [http://homepage.mac.com/entrenches/34.html webcam chat free] | [http://homepage.mac.com/bowlfuls/29.html amature webcam sex] | [http://homepage.mac.com/shy3/86.html free streaming webcams] | [http://homepage.mac.com/annealed/55.html homemade webcam sex] | [http://homepage.mac.com/absurd2/57.html teen webcam galleries] | [http://homepage.mac.com/calibre2/4.html homemade webcam video] | [http://homepage.mac.com/allegation/11.html sexy webcam blogs] | [http://homepage.mac.com/shy3/3.html online casino webcam] | [http://homepage.mac.com/shy3/57.html webcam boobs] | [http://homepage.mac.com/petrarchan/85.html jasmin webcam] | [http://homepage.mac.com/entrenches/25.html webcam teen girl] | [http://homepage.mac.com/shy3/10.html fingering webcam] | [http://homepage.mac.com/annealed/22.html webcam women] | [http://homepage.mac.com/gruffer1/1.html teen webcam girls] | [http://homepage.mac.com/gongs1/6.html webcam girls fingering] | [http://homepage.mac.com/allegation/63.html webcam] | [http://homepage.mac.com/entrenches/91.html webcam ass] | [http://homepage.mac.com/fagoting/41.html my private webcam] | [http://homepage.mac.com/petrarchan/47.html free nude webcams] | [http://homepage.mac.com/dybbuks/38.html jasmin webcam] | [http://homepage.mac.com/entrenches/94.html free webcam hosting] | [http://homepage.mac.com/woads/70.html porn webcam] | [http://homepage.mac.com/shy3/86.html webcam masterbation] | [http://homepage.mac.com/corsica4/44.html webcams online] | [http://homepage.mac.com/allegation/68.html free webcam pics] | [http://homepage.mac.com/knob10/61.html webcam hot] | [http://homepage.mac.com/subcranial/30.html free male webcams] | [http://homepage.mac.com/petrarchan/65.html webcam strip tease] | [http://homepage.mac.com/bowlfuls/60.html webcam live chat] | [http://homepage.mac.com/entrenches/40.html webcam flash] | [http://homepage.mac.com/annealed/23.html webcam sex free] | [http://homepage.mac.com/gruffer1/65.html blonde webcam] | [http://homepage.mac.com/annealed/87.html webcam freaks] | [http://homepage.mac.com/bowlfuls/90.html webcam amatrice strip] | [http://homepage.mac.com/petrarchan/35.html broadcast webcam free] | [http://homepage.mac.com/petrarchan/87.html girl webcam] | [http://homepage.mac.com/annealed/8.html webcam private] | [http://homepage.mac.com/petrarchan/4.html webcam cum] | [http://homepage.mac.com/entrenches/66.html college webcams] | [http://homepage.mac.com/dogtired1/7.html le webcam choisit] | [http://homepage.mac.com/annealed/2.html webcam clips] | [http://homepage.mac.com/shy3/45.html nude webcam chat] | [http://homepage.mac.com/woads/76.html webcam girl nude] | [http://homepage.mac.com/bowlfuls/40.html boobs on webcam] | [http://homepage.mac.com/woads/9.html sexy teen webcam] | [http://homepage.mac.com/bowlfuls/45.html webcam amature] | [http://homepage.mac.com/corsica4/10.html webcam teen girls] | [http://homepage.mac.com/woads/81.html webcam msn] | [http://homepage.mac.com/subcranial/3.html free webcam pics] | [http://homepage.mac.com/annealed/59.html webcam orgasm] | [http://homepage.mac.com/petrarchan/95.html webcam fucking] | [http://homepage.mac.com/pericles4/35.html webcam men] | [http://homepage.mac.com/bowlfuls/57.html webcam galleries] | [http://homepage.mac.com/calibre2/19.html webcam hottie] | [http://homepage.mac.com/calibre2/82.html free amateur webcam] | [http://homepage.mac.com/shy3/37.html teen webcam] | [http://homepage.mac.com/leitmotif1/94.html yahoo webcam girls] | [http://homepage.mac.com/dybbuks/1.html paige webcam] | [http://homepage.mac.com/allegation/3.html webcam uritorco] | [http://homepage.mac.com/gruffer1/5.html strip webcam] | [http://homepage.mac.com/corsica4/30.html webcam flashers] | [http://homepage.mac.com/gruffer1/91.html black girl webcam] | [http://homepage.mac.com/bowlfuls/71.html live sex webcam] | [http://homepage.mac.com/bowlfuls/49.html webcam fantasies] | [http://homepage.mac.com/dogtired1/57.html candid teen webcams] | [http://homepage.mac.com/shy3/7.html sexy webcam videos] | [http://homepage.mac.com/allegation/14.html spy webcam]
+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]].

----
CategoryGlossary