Mercurial > hg
annotate tests/test-clone-r.t @ 45659:a475db79d84d
changing-files: add a "salvaged" set to track file that were not removed
We need this set for the copy tracing algorithm. See documentation for details
about this set.
Differential Revision: https://phab.mercurial-scm.org/D9118
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 14 Sep 2020 23:46:21 +0200 |
parents | f1186c292d03 |
children | ccd76e292be5 |
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 |
39282
828a45233036
debugcommands: introduce debugrevlogindex (BC)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37283
diff
changeset
|
40 $ hg debugrevlogindex -f 1 afile |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
41 rev flag size link p1 p2 nodeid |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
42 0 0000 2 0 -1 -1 362fef284ce2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
43 1 0000 4 1 0 -1 125144f7e028 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
44 2 0000 6 2 1 -1 4c982badb186 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
45 3 0000 8 3 2 -1 19b1fc555737 |
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 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
48 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
49 0 7 2565f3199a74 000000000000 000000000000 |
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 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
52 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
53 0 8 2565f3199a74 000000000000 000000000000 |
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 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
56 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
57 0 6 12ab3bcc5ea4 000000000000 000000000000 |
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 |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
60 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
61 0 0 43eadb1d2d06 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
62 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
63 2 2 626a32663c2f 8b89697eba2c 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
64 3 3 f54c32f13478 626a32663c2f 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
65 4 6 de68e904d169 626a32663c2f 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
66 5 7 09bb521d218d de68e904d169 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
67 6 8 1fde233dfb0f f54c32f13478 000000000000 |
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 |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
74 checked 9 changesets with 7 changes to 4 files |
11925
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 |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
92 new changesets f9ee2f85a263 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
93 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
94 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
|
95 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
96 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
97 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
98 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
99 checked 1 changesets with 1 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
100 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
101 ---- hg clone -r 1 test test-1 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
102 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
103 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
104 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
105 added 2 changesets with 2 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
106 new changesets f9ee2f85a263:34c2bf6b0626 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
107 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
108 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
|
109 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
110 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
111 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
112 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
113 checked 2 changesets with 2 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
114 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
115 ---- hg clone -r 2 test test-2 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
116 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
117 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
118 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
119 added 3 changesets with 3 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
120 new changesets f9ee2f85a263:e38ba6f5b7e0 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
121 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
122 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
|
123 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
124 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
125 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
126 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
127 checked 3 changesets with 3 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
128 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
129 ---- hg clone -r 3 test test-3 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
130 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
131 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
132 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
133 added 4 changesets with 4 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
134 new changesets f9ee2f85a263:eebf5a27f8ca |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
135 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
136 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
|
137 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
138 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
139 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
140 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
141 checked 4 changesets with 4 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
142 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
143 ---- hg clone -r 4 test test-4 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
144 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
145 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
146 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
147 added 2 changesets with 2 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
148 new changesets f9ee2f85a263:095197eb4973 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
149 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
150 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
|
151 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
152 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
153 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
154 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
155 checked 2 changesets with 2 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
156 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
157 ---- hg clone -r 5 test test-5 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
158 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
159 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
160 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
161 added 3 changesets with 3 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
162 new changesets f9ee2f85a263:1bb50a9436a7 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
163 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
164 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
|
165 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
166 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
167 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
168 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
169 checked 3 changesets with 3 changes to 1 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
170 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
171 ---- hg clone -r 6 test test-6 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
172 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
173 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
174 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
175 added 4 changesets with 5 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
176 new changesets f9ee2f85a263:7373c1169842 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
177 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
178 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
|
179 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
180 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
181 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
182 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
183 checked 4 changesets with 5 changes to 2 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
184 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
185 ---- hg clone -r 7 test test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
186 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
187 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
188 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
189 added 5 changesets with 6 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
190 new changesets f9ee2f85a263:a6a34bfa0076 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
191 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
192 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
|
193 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
194 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
195 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
196 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
197 checked 5 changesets with 6 changes to 3 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
198 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
199 ---- hg clone -r 8 test test-8 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
200 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
201 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
202 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
203 added 5 changesets with 5 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
204 new changesets f9ee2f85a263:aa35859c02ea |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
205 updating to branch default |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
206 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
|
207 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
208 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
209 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
210 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
211 checked 5 changesets with 5 changes to 2 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
212 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
213 $ cd test-8 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
214 $ hg pull ../test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
215 pulling from ../test-7 |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
216 searching for changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
217 adding changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
218 adding manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
219 adding file changes |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
220 added 4 changesets with 2 changes to 3 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
221 new changesets 095197eb4973:a6a34bfa0076 |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
222 (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
|
223 $ hg verify |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
224 checking changesets |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
225 checking manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
226 crosschecking files in changesets and manifests |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
227 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39282
diff
changeset
|
228 checked 9 changesets with 7 changes to 4 files |
11925
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
229 $ cd .. |
1d03c927a428
tests: unify test-clone-r
Adrian Buehlmann <adrian@cadifra.com>
parents:
3853
diff
changeset
|
230 |
26103
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
231 $ hg clone test test-9 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
232 updating to branch default |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
234 $ cd test-9 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
235 $ hg branch foobar |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
236 marked working directory as branch foobar |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
237 (branches are permanent and global, did you want a bookmark?) |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
238 $ echo file2 >> file2 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
239 $ hg add file2 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
240 $ hg commit -m "changeset9" |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
241 $ echo file3 >> file3 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
242 $ hg add file3 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
243 $ hg commit -m "changeset10" |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
244 $ cd .. |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
245 $ hg clone -r 9 -u foobar test-9 test-10 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
246 adding changesets |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
247 adding manifests |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
248 adding file changes |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
249 added 6 changesets with 6 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
26926
diff
changeset
|
250 new changesets f9ee2f85a263:7100abb79635 |
26103
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
251 updating to branch foobar |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
252 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
253 |
30be3aeb5344
clone: fix updaterev to update to latest branch changeset (issue4528)
liscju <piotr.listkiewicz@gmail.com>
parents:
17132
diff
changeset
|
254 |