Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-clone.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg init
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     2
 
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset 
     3
 
+ hg commit -m test -d 0 0
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg clone . ../b
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     5
 
a
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     6
 
+ hg verify
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     7
 
checking changesets
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     8
 
checking manifests
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     9
 
crosschecking files in changesets and manifests
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    10
 
checking files
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    11
 
1 files, 1 changesets, 1 total revisions
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    12
 
+ hg clone -U . ../c
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    13
 
cat: a: No such file or directory
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    14
 
+ hg verify
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    15
 
checking changesets
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    16
 
checking manifests
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    17
 
crosschecking files in changesets and manifests
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    18
 
checking files
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    19
 
1 files, 1 changesets, 1 total revisions
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    20
 
+ hg clone ../a
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    21
 
+ hg cat a
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    22
 
a
mercurial-crew-with-dirclash