Mercurial > hg
annotate tests/test-clone-r.t @ 18042:551e2901192e
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Thu, 06 Dec 2012 22:07:44 -0600 |
parents | b87acfda5268 |
children | 30be3aeb5344 |
rev | line source |
---|---|
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
1 $ hg init test |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
2 $ cd test |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
3 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
4 $ echo 0 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
5 $ hg add afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
6 $ hg commit -m "0.0" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
8 $ echo 1 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
9 $ hg commit -m "0.1" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
10 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
11 $ echo 2 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
12 $ hg commit -m "0.2" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
13 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
14 $ echo 3 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
15 $ hg commit -m "0.3" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
16 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
17 $ hg update -C 0 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
18 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
19 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
20 $ echo 1 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
21 $ hg commit -m "1.1" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
22 created new head |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
23 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
24 $ echo 2 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
25 $ hg commit -m "1.2" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
26 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
27 $ echo a line > fred |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
28 $ echo 3 >> afile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
29 $ hg add fred |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
30 $ hg commit -m "1.3" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
31 $ hg mv afile adifferentfile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
32 $ hg commit -m "1.3m" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
33 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
34 $ hg update -C 3 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
35 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
36 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
37 $ hg mv afile anotherfile |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
38 $ hg commit -m "0.3m" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
39 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12893
diff
changeset
|
40 $ hg debugindex -f 1 afile |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
41 rev flag offset length size ..... link p1 p2 nodeid (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
42 0 0000 0 3 2 ..... 0 -1 -1 362fef284ce2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
43 1 0000 3 5 4 ..... 1 0 -1 125144f7e028 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
44 2 0000 8 7 6 ..... 2 1 -1 4c982badb186 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
45 3 0000 15 9 8 ..... 3 2 -1 19b1fc555737 (re) |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
46 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12893
diff
changeset
|
47 $ hg debugindex adifferentfile |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
48 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
49 0 0 75 ..... 7 2565f3199a74 000000000000 000000000000 (re) |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
50 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12893
diff
changeset
|
51 $ hg debugindex anotherfile |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
52 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
53 0 0 75 ..... 8 2565f3199a74 000000000000 000000000000 (re) |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
54 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12893
diff
changeset
|
55 $ hg debugindex fred |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
56 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
57 0 0 8 ..... 6 12ab3bcc5ea4 000000000000 000000000000 (re) |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
58 |
14323
a79fea6b3e77
debugindex etc.: add --changelog and --manifest options
Sune Foldager <cryo@cyanite.org>
parents:
14182
diff
changeset
|
59 $ hg debugindex --manifest |
17132
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
60 rev offset length ..... linkrev nodeid p1 p2 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
61 0 0 48 ..... 0 43eadb1d2d06 000000000000 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
62 1 48 48 ..... 1 8b89697eba2c 43eadb1d2d06 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
63 2 96 48 ..... 2 626a32663c2f 8b89697eba2c 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
64 3 144 48 ..... 3 f54c32f13478 626a32663c2f 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
65 4 192 .. ..... 6 de68e904d169 626a32663c2f 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
66 5 2.. 68 ..... 7 09bb521d218d de68e904d169 000000000000 (re) |
b87acfda5268
tests: reduce spurious failures when run with generaldelta
Bryan O'Sullivan <bryano@fb.com>
parents:
14323
diff
changeset
|
67 6 3.. 54 ..... 8 1fde233dfb0f f54c32f13478 000000000000 (re) |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
68 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
69 $ hg verify |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
70 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
71 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
72 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
73 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
74 4 files, 9 changesets, 7 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
75 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
76 $ cd .. |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
77 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
78 $ for i in 0 1 2 3 4 5 6 7 8; do |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
79 > echo |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
80 > echo ---- hg clone -r "$i" test test-"$i" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
81 > hg clone -r "$i" test test-"$i" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
82 > cd test-"$i" |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
83 > hg verify |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
84 > cd .. |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
85 > done |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
86 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
87 ---- hg clone -r 0 test test-0 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
88 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
89 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
90 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
91 added 1 changesets with 1 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
92 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
94 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
95 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
96 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
97 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
98 1 files, 1 changesets, 1 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
99 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
100 ---- hg clone -r 1 test test-1 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
101 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
102 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
103 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
104 added 2 changesets with 2 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
105 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
107 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
108 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
109 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
110 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
111 1 files, 2 changesets, 2 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
112 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
113 ---- hg clone -r 2 test test-2 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
114 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
115 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
116 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
117 added 3 changesets with 3 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
118 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
119 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
120 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
121 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
122 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
123 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
124 1 files, 3 changesets, 3 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
125 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
126 ---- hg clone -r 3 test test-3 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
127 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
128 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
129 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
130 added 4 changesets with 4 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
131 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
132 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
133 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
134 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
135 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
136 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
137 1 files, 4 changesets, 4 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
138 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
139 ---- hg clone -r 4 test test-4 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
140 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
141 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
142 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
143 added 2 changesets with 2 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
144 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
146 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
147 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
148 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
149 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
150 1 files, 2 changesets, 2 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
151 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
152 ---- hg clone -r 5 test test-5 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
153 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
154 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
155 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
156 added 3 changesets with 3 changes to 1 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
157 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
159 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
160 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
161 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
162 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
163 1 files, 3 changesets, 3 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
164 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
165 ---- hg clone -r 6 test test-6 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
166 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
167 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
168 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
169 added 4 changesets with 5 changes to 2 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
170 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
171 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
172 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
173 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
174 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
175 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
176 2 files, 4 changesets, 5 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
177 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
178 ---- hg clone -r 7 test test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
179 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
180 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
181 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
182 added 5 changesets with 6 changes to 3 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
183 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
184 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
185 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
186 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
187 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
188 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
189 3 files, 5 changesets, 6 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
190 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
191 ---- hg clone -r 8 test test-8 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
192 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
193 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
194 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
195 added 5 changesets with 5 changes to 2 files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
196 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
197 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
198 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
199 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
200 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
201 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
202 2 files, 5 changesets, 5 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
203 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
204 $ cd test-8 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
205 $ hg pull ../test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
206 pulling from ../test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
207 searching for changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
208 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
209 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
210 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
211 added 4 changesets with 2 changes to 3 files (+1 heads) |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
212 (run 'hg heads' to see heads, 'hg merge' to merge) |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
213 $ hg verify |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
214 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
215 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
216 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
217 checking files |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
218 4 files, 9 changesets, 7 total revisions |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
219 $ cd .. |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
220 |