Show More
@@ -5,19 +5,19 b'' | |||||
5 | $ hg -v addremove |
|
5 | $ hg -v addremove | |
6 | adding dir/bar |
|
6 | adding dir/bar | |
7 | adding foo |
|
7 | adding foo | |
8 |
$ hg -v commit -m "add 1" |
|
8 | $ hg -v commit -m "add 1" | |
9 | dir/bar |
|
9 | dir/bar | |
10 | foo |
|
10 | foo | |
11 |
committed changeset 0: |
|
11 | committed changeset 0:6f7f953567a2 | |
12 | $ cd dir/ |
|
12 | $ cd dir/ | |
13 | $ touch ../foo_2 bar_2 |
|
13 | $ touch ../foo_2 bar_2 | |
14 | $ hg -v addremove |
|
14 | $ hg -v addremove | |
15 | adding dir/bar_2 |
|
15 | adding dir/bar_2 | |
16 | adding foo_2 |
|
16 | adding foo_2 | |
17 |
$ hg -v commit -m "add 2" |
|
17 | $ hg -v commit -m "add 2" | |
18 | dir/bar_2 |
|
18 | dir/bar_2 | |
19 | foo_2 |
|
19 | foo_2 | |
20 |
committed changeset 1: |
|
20 | committed changeset 1:e65414bf35c5 | |
21 |
|
21 | |||
22 | $ cd .. |
|
22 | $ cd .. | |
23 | $ hg init sim |
|
23 | $ hg init sim |
@@ -1,12 +1,12 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ echo This is file a1 > a |
|
2 | $ echo This is file a1 > a | |
3 | $ hg add a |
|
3 | $ hg add a | |
4 |
$ hg commit -m "commit #0" |
|
4 | $ hg commit -m "commit #0" | |
5 | $ ls |
|
5 | $ ls | |
6 | a |
|
6 | a | |
7 | $ echo This is file b1 > b |
|
7 | $ echo This is file b1 > b | |
8 | $ hg add b |
|
8 | $ hg add b | |
9 |
$ hg commit -m "commit #1" |
|
9 | $ hg commit -m "commit #1" | |
10 | $ hg co 0 |
|
10 | $ hg co 0 | |
11 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
11 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
12 |
|
12 |
@@ -8,15 +8,15 b' Make a changeset:' | |||||
8 |
|
8 | |||
9 | $ echo a > a |
|
9 | $ echo a > a | |
10 | $ hg add a |
|
10 | $ hg add a | |
11 |
$ hg commit -m test |
|
11 | $ hg commit -m test | |
12 |
|
12 | |||
13 | This command is ancient: |
|
13 | This command is ancient: | |
14 |
|
14 | |||
15 | $ hg history |
|
15 | $ hg history | |
16 |
changeset: 0: |
|
16 | changeset: 0:acb14030fe0a | |
17 | tag: tip |
|
17 | tag: tip | |
18 | user: test |
|
18 | user: test | |
19 |
date: |
|
19 | date: Thu Jan 01 00:00:00 1970 +0000 | |
20 | summary: test |
|
20 | summary: test | |
21 |
|
21 | |||
22 |
|
22 |
@@ -13,7 +13,7 b' add file' | |||||
13 |
|
13 | |||
14 | commit first revision |
|
14 | commit first revision | |
15 |
|
15 | |||
16 |
$ hg ci -m 1 |
|
16 | $ hg ci -m 1 | |
17 |
|
17 | |||
18 | set bookmark |
|
18 | set bookmark | |
19 |
|
19 | |||
@@ -23,7 +23,7 b' set bookmark' | |||||
23 |
|
23 | |||
24 | commit second revision |
|
24 | commit second revision | |
25 |
|
25 | |||
26 |
$ hg ci -m 2 |
|
26 | $ hg ci -m 2 | |
27 |
|
27 | |||
28 | set bookmark |
|
28 | set bookmark | |
29 |
|
29 | |||
@@ -38,14 +38,14 b' update to -2' | |||||
38 |
|
38 | |||
39 | commit new head |
|
39 | commit new head | |
40 |
|
40 | |||
41 |
$ hg ci -m 3 |
|
41 | $ hg ci -m 3 | |
42 | created new head |
|
42 | created new head | |
43 |
|
43 | |||
44 | bookmarks updated? |
|
44 | bookmarks updated? | |
45 |
|
45 | |||
46 | $ hg book |
|
46 | $ hg book | |
47 |
test 1: |
|
47 | test 1:25e1ee7a0081 | |
48 |
test2 1: |
|
48 | test2 1:25e1ee7a0081 | |
49 |
|
49 | |||
50 | strip to revision 1 |
|
50 | strip to revision 1 | |
51 |
|
51 | |||
@@ -55,6 +55,6 b' strip to revision 1' | |||||
55 | list bookmarks |
|
55 | list bookmarks | |
56 |
|
56 | |||
57 | $ hg book |
|
57 | $ hg book | |
58 |
* test 1: |
|
58 | * test 1:8cf31af87a2b | |
59 |
* test2 1: |
|
59 | * test2 1:8cf31af87a2b | |
60 |
|
60 |
@@ -2,30 +2,30 b'' | |||||
2 | $ cd test |
|
2 | $ cd test | |
3 | $ echo "0" >> afile |
|
3 | $ echo "0" >> afile | |
4 | $ hg add afile |
|
4 | $ hg add afile | |
5 |
$ hg commit -m "0.0" |
|
5 | $ hg commit -m "0.0" | |
6 | $ echo "1" >> afile |
|
6 | $ echo "1" >> afile | |
7 |
$ hg commit -m "0.1" |
|
7 | $ hg commit -m "0.1" | |
8 | $ echo "2" >> afile |
|
8 | $ echo "2" >> afile | |
9 |
$ hg commit -m "0.2" |
|
9 | $ hg commit -m "0.2" | |
10 | $ echo "3" >> afile |
|
10 | $ echo "3" >> afile | |
11 |
$ hg commit -m "0.3" |
|
11 | $ hg commit -m "0.3" | |
12 | $ hg update -C 0 |
|
12 | $ hg update -C 0 | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | $ echo "1" >> afile |
|
14 | $ echo "1" >> afile | |
15 |
$ hg commit -m "1.1" |
|
15 | $ hg commit -m "1.1" | |
16 | created new head |
|
16 | created new head | |
17 | $ echo "2" >> afile |
|
17 | $ echo "2" >> afile | |
18 |
$ hg commit -m "1.2" |
|
18 | $ hg commit -m "1.2" | |
19 | $ echo "a line" > fred |
|
19 | $ echo "a line" > fred | |
20 | $ echo "3" >> afile |
|
20 | $ echo "3" >> afile | |
21 | $ hg add fred |
|
21 | $ hg add fred | |
22 |
$ hg commit -m "1.3" |
|
22 | $ hg commit -m "1.3" | |
23 | $ hg mv afile adifferentfile |
|
23 | $ hg mv afile adifferentfile | |
24 |
$ hg commit -m "1.3m" |
|
24 | $ hg commit -m "1.3m" | |
25 | $ hg update -C 3 |
|
25 | $ hg update -C 3 | |
26 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
26 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
27 | $ hg mv afile anotherfile |
|
27 | $ hg mv afile anotherfile | |
28 |
$ hg commit -m "0.3m" |
|
28 | $ hg commit -m "0.3m" | |
29 | $ hg debugindex .hg/store/data/afile.i |
|
29 | $ hg debugindex .hg/store/data/afile.i | |
30 | rev offset length base linkrev nodeid p1 p2 |
|
30 | rev offset length base linkrev nodeid p1 p2 | |
31 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
31 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
@@ -79,7 +79,7 b'' | |||||
79 | crosschecking files in changesets and manifests |
|
79 | crosschecking files in changesets and manifests | |
80 | checking files |
|
80 | checking files | |
81 | 1 files, 1 changesets, 1 total revisions |
|
81 | 1 files, 1 changesets, 1 total revisions | |
82 | 0:5649c9d34dd8 |
|
82 | 0:f9ee2f85a263 | |
83 | searching for changes |
|
83 | searching for changes | |
84 | 2 changesets found |
|
84 | 2 changesets found | |
85 | adding changesets |
|
85 | adding changesets | |
@@ -92,7 +92,7 b'' | |||||
92 | crosschecking files in changesets and manifests |
|
92 | crosschecking files in changesets and manifests | |
93 | checking files |
|
93 | checking files | |
94 | 1 files, 2 changesets, 2 total revisions |
|
94 | 1 files, 2 changesets, 2 total revisions | |
95 | 1:10b2180f755b |
|
95 | 1:34c2bf6b0626 | |
96 | searching for changes |
|
96 | searching for changes | |
97 | 3 changesets found |
|
97 | 3 changesets found | |
98 | adding changesets |
|
98 | adding changesets | |
@@ -105,7 +105,7 b'' | |||||
105 | crosschecking files in changesets and manifests |
|
105 | crosschecking files in changesets and manifests | |
106 | checking files |
|
106 | checking files | |
107 | 1 files, 3 changesets, 3 total revisions |
|
107 | 1 files, 3 changesets, 3 total revisions | |
108 | 2:d62976ca1e50 |
|
108 | 2:e38ba6f5b7e0 | |
109 | searching for changes |
|
109 | searching for changes | |
110 | 4 changesets found |
|
110 | 4 changesets found | |
111 | adding changesets |
|
111 | adding changesets | |
@@ -118,7 +118,7 b'' | |||||
118 | crosschecking files in changesets and manifests |
|
118 | crosschecking files in changesets and manifests | |
119 | checking files |
|
119 | checking files | |
120 | 1 files, 4 changesets, 4 total revisions |
|
120 | 1 files, 4 changesets, 4 total revisions | |
121 | 3:ac69c658229d |
|
121 | 3:eebf5a27f8ca | |
122 | searching for changes |
|
122 | searching for changes | |
123 | 2 changesets found |
|
123 | 2 changesets found | |
124 | adding changesets |
|
124 | adding changesets | |
@@ -131,7 +131,7 b'' | |||||
131 | crosschecking files in changesets and manifests |
|
131 | crosschecking files in changesets and manifests | |
132 | checking files |
|
132 | checking files | |
133 | 1 files, 2 changesets, 2 total revisions |
|
133 | 1 files, 2 changesets, 2 total revisions | |
134 | 1:5f4f3ceb285e |
|
134 | 1:095197eb4973 | |
135 | searching for changes |
|
135 | searching for changes | |
136 | 3 changesets found |
|
136 | 3 changesets found | |
137 | adding changesets |
|
137 | adding changesets | |
@@ -144,7 +144,7 b'' | |||||
144 | crosschecking files in changesets and manifests |
|
144 | crosschecking files in changesets and manifests | |
145 | checking files |
|
145 | checking files | |
146 | 1 files, 3 changesets, 3 total revisions |
|
146 | 1 files, 3 changesets, 3 total revisions | |
147 | 2:024e4e7df376 |
|
147 | 2:1bb50a9436a7 | |
148 | searching for changes |
|
148 | searching for changes | |
149 | 4 changesets found |
|
149 | 4 changesets found | |
150 | adding changesets |
|
150 | adding changesets | |
@@ -157,7 +157,7 b'' | |||||
157 | crosschecking files in changesets and manifests |
|
157 | crosschecking files in changesets and manifests | |
158 | checking files |
|
158 | checking files | |
159 | 2 files, 4 changesets, 5 total revisions |
|
159 | 2 files, 4 changesets, 5 total revisions | |
160 | 3:1e3f6b843bd6 |
|
160 | 3:7373c1169842 | |
161 | searching for changes |
|
161 | searching for changes | |
162 | 5 changesets found |
|
162 | 5 changesets found | |
163 | adding changesets |
|
163 | adding changesets | |
@@ -170,7 +170,7 b'' | |||||
170 | crosschecking files in changesets and manifests |
|
170 | crosschecking files in changesets and manifests | |
171 | checking files |
|
171 | checking files | |
172 | 3 files, 5 changesets, 6 total revisions |
|
172 | 3 files, 5 changesets, 6 total revisions | |
173 | 4:27f57c869697 |
|
173 | 4:a6a34bfa0076 | |
174 | searching for changes |
|
174 | searching for changes | |
175 | 5 changesets found |
|
175 | 5 changesets found | |
176 | adding changesets |
|
176 | adding changesets | |
@@ -183,7 +183,7 b'' | |||||
183 | crosschecking files in changesets and manifests |
|
183 | crosschecking files in changesets and manifests | |
184 | checking files |
|
184 | checking files | |
185 | 2 files, 5 changesets, 5 total revisions |
|
185 | 2 files, 5 changesets, 5 total revisions | |
186 | 4:088ff9d6e1e1 |
|
186 | 4:aa35859c02ea | |
187 | $ cd test-8 |
|
187 | $ cd test-8 | |
188 | $ hg pull ../test-7 |
|
188 | $ hg pull ../test-7 | |
189 | pulling from ../test-7 |
|
189 | pulling from ../test-7 | |
@@ -242,17 +242,17 b' issue1910' | |||||
242 | revision 2 |
|
242 | revision 2 | |
243 |
|
243 | |||
244 | $ hg tip -q |
|
244 | $ hg tip -q | |
245 | 2:d62976ca1e50 |
|
245 | 2:e38ba6f5b7e0 | |
246 | $ hg unbundle ../test-bundle-should-fail.hg |
|
246 | $ hg unbundle ../test-bundle-should-fail.hg | |
247 | adding changesets |
|
247 | adding changesets | |
248 | transaction abort! |
|
248 | transaction abort! | |
249 | rollback completed |
|
249 | rollback completed | |
250 |
abort: 00changelog.i@ |
|
250 | abort: 00changelog.i@eebf5a27f8ca: unknown parent! | |
251 |
|
251 | |||
252 | revision 2 |
|
252 | revision 2 | |
253 |
|
253 | |||
254 | $ hg tip -q |
|
254 | $ hg tip -q | |
255 | 2:d62976ca1e50 |
|
255 | 2:e38ba6f5b7e0 | |
256 | $ hg unbundle ../test-bundle-all.hg |
|
256 | $ hg unbundle ../test-bundle-all.hg | |
257 | adding changesets |
|
257 | adding changesets | |
258 | adding manifests |
|
258 | adding manifests | |
@@ -263,7 +263,7 b' revision 2' | |||||
263 | revision 8 |
|
263 | revision 8 | |
264 |
|
264 | |||
265 | $ hg tip -q |
|
265 | $ hg tip -q | |
266 | 8:088ff9d6e1e1 |
|
266 | 8:aa35859c02ea | |
267 | $ hg verify |
|
267 | $ hg verify | |
268 | checking changesets |
|
268 | checking changesets | |
269 | checking manifests |
|
269 | checking manifests | |
@@ -276,7 +276,7 b' revision 8' | |||||
276 | revision 2 |
|
276 | revision 2 | |
277 |
|
277 | |||
278 | $ hg tip -q |
|
278 | $ hg tip -q | |
279 | 2:d62976ca1e50 |
|
279 | 2:e38ba6f5b7e0 | |
280 | $ hg unbundle ../test-bundle-branch1.hg |
|
280 | $ hg unbundle ../test-bundle-branch1.hg | |
281 | adding changesets |
|
281 | adding changesets | |
282 | adding manifests |
|
282 | adding manifests | |
@@ -287,7 +287,7 b' revision 2' | |||||
287 | revision 4 |
|
287 | revision 4 | |
288 |
|
288 | |||
289 | $ hg tip -q |
|
289 | $ hg tip -q | |
290 | 4:088ff9d6e1e1 |
|
290 | 4:aa35859c02ea | |
291 | $ hg verify |
|
291 | $ hg verify | |
292 | checking changesets |
|
292 | checking changesets | |
293 | checking manifests |
|
293 | checking manifests | |
@@ -306,7 +306,7 b' revision 4' | |||||
306 | revision 6 |
|
306 | revision 6 | |
307 |
|
307 | |||
308 | $ hg tip -q |
|
308 | $ hg tip -q | |
309 | 6:27f57c869697 |
|
309 | 6:a6a34bfa0076 | |
310 | $ hg verify |
|
310 | $ hg verify | |
311 | checking changesets |
|
311 | checking changesets | |
312 | checking manifests |
|
312 | checking manifests | |
@@ -325,7 +325,7 b' revision 6' | |||||
325 | revision 4 |
|
325 | revision 4 | |
326 |
|
326 | |||
327 | $ hg tip -q |
|
327 | $ hg tip -q | |
328 | 4:088ff9d6e1e1 |
|
328 | 4:aa35859c02ea | |
329 | $ hg verify |
|
329 | $ hg verify | |
330 | checking changesets |
|
330 | checking changesets | |
331 | checking manifests |
|
331 | checking manifests | |
@@ -340,7 +340,7 b' revision 4' | |||||
340 | adifferentfile |
|
340 | adifferentfile | |
341 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
341 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
342 | (branch merge, don't forget to commit) |
|
342 | (branch merge, don't forget to commit) | |
343 |
$ hg ci -m merge |
|
343 | $ hg ci -m merge | |
344 | $ cd .. |
|
344 | $ cd .. | |
345 | $ hg -R test bundle --base 2 test-bundle-head.hg |
|
345 | $ hg -R test bundle --base 2 test-bundle-head.hg | |
346 | 7 changesets found |
|
346 | 7 changesets found | |
@@ -358,7 +358,7 b' revision 4' | |||||
358 | revision 9 |
|
358 | revision 9 | |
359 |
|
359 | |||
360 | $ hg tip -q |
|
360 | $ hg tip -q | |
361 | 9:e3061ea42e4c |
|
361 | 9:905597b0d5d4 | |
362 | $ hg verify |
|
362 | $ hg verify | |
363 | checking changesets |
|
363 | checking changesets | |
364 | checking manifests |
|
364 | checking manifests |
@@ -6,30 +6,30 b' Setting up test' | |||||
6 | $ cd test |
|
6 | $ cd test | |
7 | $ echo 0 > afile |
|
7 | $ echo 0 > afile | |
8 | $ hg add afile |
|
8 | $ hg add afile | |
9 |
$ hg commit -m "0.0" |
|
9 | $ hg commit -m "0.0" | |
10 | $ echo 1 >> afile |
|
10 | $ echo 1 >> afile | |
11 |
$ hg commit -m "0.1" |
|
11 | $ hg commit -m "0.1" | |
12 | $ echo 2 >> afile |
|
12 | $ echo 2 >> afile | |
13 |
$ hg commit -m "0.2" |
|
13 | $ hg commit -m "0.2" | |
14 | $ echo 3 >> afile |
|
14 | $ echo 3 >> afile | |
15 |
$ hg commit -m "0.3" |
|
15 | $ hg commit -m "0.3" | |
16 | $ hg update -C 0 |
|
16 | $ hg update -C 0 | |
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | $ echo 1 >> afile |
|
18 | $ echo 1 >> afile | |
19 |
$ hg commit -m "1.1" |
|
19 | $ hg commit -m "1.1" | |
20 | created new head |
|
20 | created new head | |
21 | $ echo 2 >> afile |
|
21 | $ echo 2 >> afile | |
22 |
$ hg commit -m "1.2" |
|
22 | $ hg commit -m "1.2" | |
23 | $ echo "a line" > fred |
|
23 | $ echo "a line" > fred | |
24 | $ echo 3 >> afile |
|
24 | $ echo 3 >> afile | |
25 | $ hg add fred |
|
25 | $ hg add fred | |
26 |
$ hg commit -m "1.3" |
|
26 | $ hg commit -m "1.3" | |
27 | $ hg mv afile adifferentfile |
|
27 | $ hg mv afile adifferentfile | |
28 |
$ hg commit -m "1.3m" |
|
28 | $ hg commit -m "1.3m" | |
29 | $ hg update -C 3 |
|
29 | $ hg update -C 3 | |
30 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
30 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
31 | $ hg mv afile anotherfile |
|
31 | $ hg mv afile anotherfile | |
32 |
$ hg commit -m "0.3m" |
|
32 | $ hg commit -m "0.3m" | |
33 | $ hg verify |
|
33 | $ hg verify | |
34 | checking changesets |
|
34 | checking changesets | |
35 | checking manifests |
|
35 | checking manifests | |
@@ -139,52 +139,52 b' Log -R full.hg in fresh empty' | |||||
139 | $ hg init empty |
|
139 | $ hg init empty | |
140 | $ cd empty |
|
140 | $ cd empty | |
141 | $ hg -R bundle://../full.hg log |
|
141 | $ hg -R bundle://../full.hg log | |
142 |
changeset: 8: |
|
142 | changeset: 8:aa35859c02ea | |
143 | tag: tip |
|
143 | tag: tip | |
144 |
parent: 3: |
|
144 | parent: 3:eebf5a27f8ca | |
145 | user: test |
|
145 | user: test | |
146 |
date: |
|
146 | date: Thu Jan 01 00:00:00 1970 +0000 | |
147 | summary: 0.3m |
|
147 | summary: 0.3m | |
148 |
|
148 | |||
149 |
changeset: 7: |
|
149 | changeset: 7:a6a34bfa0076 | |
150 | user: test |
|
150 | user: test | |
151 |
date: |
|
151 | date: Thu Jan 01 00:00:00 1970 +0000 | |
152 | summary: 1.3m |
|
152 | summary: 1.3m | |
153 |
|
153 | |||
154 |
changeset: 6: |
|
154 | changeset: 6:7373c1169842 | |
155 | user: test |
|
155 | user: test | |
156 |
date: |
|
156 | date: Thu Jan 01 00:00:00 1970 +0000 | |
157 | summary: 1.3 |
|
157 | summary: 1.3 | |
158 |
|
158 | |||
159 |
changeset: 5: |
|
159 | changeset: 5:1bb50a9436a7 | |
160 | user: test |
|
160 | user: test | |
161 |
date: |
|
161 | date: Thu Jan 01 00:00:00 1970 +0000 | |
162 | summary: 1.2 |
|
162 | summary: 1.2 | |
163 |
|
163 | |||
164 |
changeset: 4: |
|
164 | changeset: 4:095197eb4973 | |
165 |
parent: 0:56 |
|
165 | parent: 0:f9ee2f85a263 | |
166 | user: test |
|
166 | user: test | |
167 |
date: |
|
167 | date: Thu Jan 01 00:00:00 1970 +0000 | |
168 | summary: 1.1 |
|
168 | summary: 1.1 | |
169 |
|
169 | |||
170 |
changeset: 3: |
|
170 | changeset: 3:eebf5a27f8ca | |
171 | user: test |
|
171 | user: test | |
172 |
date: |
|
172 | date: Thu Jan 01 00:00:00 1970 +0000 | |
173 | summary: 0.3 |
|
173 | summary: 0.3 | |
174 |
|
174 | |||
175 |
changeset: 2: |
|
175 | changeset: 2:e38ba6f5b7e0 | |
176 | user: test |
|
176 | user: test | |
177 |
date: |
|
177 | date: Thu Jan 01 00:00:00 1970 +0000 | |
178 | summary: 0.2 |
|
178 | summary: 0.2 | |
179 |
|
179 | |||
180 |
changeset: 1: |
|
180 | changeset: 1:34c2bf6b0626 | |
181 | user: test |
|
181 | user: test | |
182 |
date: |
|
182 | date: Thu Jan 01 00:00:00 1970 +0000 | |
183 | summary: 0.1 |
|
183 | summary: 0.1 | |
184 |
|
184 | |||
185 |
changeset: 0:56 |
|
185 | changeset: 0:f9ee2f85a263 | |
186 | user: test |
|
186 | user: test | |
187 |
date: |
|
187 | date: Thu Jan 01 00:00:00 1970 +0000 | |
188 | summary: 0.0 |
|
188 | summary: 0.0 | |
189 |
|
189 | |||
190 |
|
190 | |||
@@ -198,7 +198,7 b" doesn't work (yet ?)" | |||||
198 | hg -R bundle://../full.hg verify |
|
198 | hg -R bundle://../full.hg verify | |
199 |
|
199 | |||
200 | $ hg pull bundle://../full.hg |
|
200 | $ hg pull bundle://../full.hg | |
201 |
changegroup hook: HG_NODE= |
|
201 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg | |
202 | pulling from bundle://../full.hg |
|
202 | pulling from bundle://../full.hg | |
203 | requesting all changes |
|
203 | requesting all changes | |
204 | adding changesets |
|
204 | adding changesets | |
@@ -221,7 +221,7 b' Log -R bundle:empty+full.hg' | |||||
221 | Pull full.hg into empty again (using -R; with hook) |
|
221 | Pull full.hg into empty again (using -R; with hook) | |
222 |
|
222 | |||
223 | $ hg -R empty pull full.hg |
|
223 | $ hg -R empty pull full.hg | |
224 |
changegroup hook: HG_NODE= |
|
224 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg | |
225 | pulling from full.hg |
|
225 | pulling from full.hg | |
226 | requesting all changes |
|
226 | requesting all changes | |
227 | adding changesets |
|
227 | adding changesets | |
@@ -250,52 +250,52 b' Create partial clones' | |||||
250 | Log -R full.hg in partial |
|
250 | Log -R full.hg in partial | |
251 |
|
251 | |||
252 | $ hg -R bundle://../full.hg log |
|
252 | $ hg -R bundle://../full.hg log | |
253 |
changeset: 8: |
|
253 | changeset: 8:aa35859c02ea | |
254 | tag: tip |
|
254 | tag: tip | |
255 |
parent: 3: |
|
255 | parent: 3:eebf5a27f8ca | |
256 | user: test |
|
256 | user: test | |
257 |
date: |
|
257 | date: Thu Jan 01 00:00:00 1970 +0000 | |
258 | summary: 0.3m |
|
258 | summary: 0.3m | |
259 |
|
259 | |||
260 |
changeset: 7: |
|
260 | changeset: 7:a6a34bfa0076 | |
261 | user: test |
|
261 | user: test | |
262 |
date: |
|
262 | date: Thu Jan 01 00:00:00 1970 +0000 | |
263 | summary: 1.3m |
|
263 | summary: 1.3m | |
264 |
|
264 | |||
265 |
changeset: 6: |
|
265 | changeset: 6:7373c1169842 | |
266 | user: test |
|
266 | user: test | |
267 |
date: |
|
267 | date: Thu Jan 01 00:00:00 1970 +0000 | |
268 | summary: 1.3 |
|
268 | summary: 1.3 | |
269 |
|
269 | |||
270 |
changeset: 5: |
|
270 | changeset: 5:1bb50a9436a7 | |
271 | user: test |
|
271 | user: test | |
272 |
date: |
|
272 | date: Thu Jan 01 00:00:00 1970 +0000 | |
273 | summary: 1.2 |
|
273 | summary: 1.2 | |
274 |
|
274 | |||
275 |
changeset: 4: |
|
275 | changeset: 4:095197eb4973 | |
276 |
parent: 0:56 |
|
276 | parent: 0:f9ee2f85a263 | |
277 | user: test |
|
277 | user: test | |
278 |
date: |
|
278 | date: Thu Jan 01 00:00:00 1970 +0000 | |
279 | summary: 1.1 |
|
279 | summary: 1.1 | |
280 |
|
280 | |||
281 |
changeset: 3: |
|
281 | changeset: 3:eebf5a27f8ca | |
282 | user: test |
|
282 | user: test | |
283 |
date: |
|
283 | date: Thu Jan 01 00:00:00 1970 +0000 | |
284 | summary: 0.3 |
|
284 | summary: 0.3 | |
285 |
|
285 | |||
286 |
changeset: 2: |
|
286 | changeset: 2:e38ba6f5b7e0 | |
287 | user: test |
|
287 | user: test | |
288 |
date: |
|
288 | date: Thu Jan 01 00:00:00 1970 +0000 | |
289 | summary: 0.2 |
|
289 | summary: 0.2 | |
290 |
|
290 | |||
291 |
changeset: 1: |
|
291 | changeset: 1:34c2bf6b0626 | |
292 | user: test |
|
292 | user: test | |
293 |
date: |
|
293 | date: Thu Jan 01 00:00:00 1970 +0000 | |
294 | summary: 0.1 |
|
294 | summary: 0.1 | |
295 |
|
295 | |||
296 |
changeset: 0:56 |
|
296 | changeset: 0:f9ee2f85a263 | |
297 | user: test |
|
297 | user: test | |
298 |
date: |
|
298 | date: Thu Jan 01 00:00:00 1970 +0000 | |
299 | summary: 0.0 |
|
299 | summary: 0.0 | |
300 |
|
300 | |||
301 |
|
301 | |||
@@ -304,32 +304,32 b' Incoming full.hg in partial' | |||||
304 | $ hg incoming bundle://../full.hg |
|
304 | $ hg incoming bundle://../full.hg | |
305 | comparing with bundle://../full.hg |
|
305 | comparing with bundle://../full.hg | |
306 | searching for changes |
|
306 | searching for changes | |
307 |
changeset: 4: |
|
307 | changeset: 4:095197eb4973 | |
308 |
parent: 0:56 |
|
308 | parent: 0:f9ee2f85a263 | |
309 | user: test |
|
309 | user: test | |
310 |
date: |
|
310 | date: Thu Jan 01 00:00:00 1970 +0000 | |
311 | summary: 1.1 |
|
311 | summary: 1.1 | |
312 |
|
312 | |||
313 |
changeset: 5: |
|
313 | changeset: 5:1bb50a9436a7 | |
314 | user: test |
|
314 | user: test | |
315 |
date: |
|
315 | date: Thu Jan 01 00:00:00 1970 +0000 | |
316 | summary: 1.2 |
|
316 | summary: 1.2 | |
317 |
|
317 | |||
318 |
changeset: 6: |
|
318 | changeset: 6:7373c1169842 | |
319 | user: test |
|
319 | user: test | |
320 |
date: |
|
320 | date: Thu Jan 01 00:00:00 1970 +0000 | |
321 | summary: 1.3 |
|
321 | summary: 1.3 | |
322 |
|
322 | |||
323 |
changeset: 7: |
|
323 | changeset: 7:a6a34bfa0076 | |
324 | user: test |
|
324 | user: test | |
325 |
date: |
|
325 | date: Thu Jan 01 00:00:00 1970 +0000 | |
326 | summary: 1.3m |
|
326 | summary: 1.3m | |
327 |
|
327 | |||
328 |
changeset: 8: |
|
328 | changeset: 8:aa35859c02ea | |
329 | tag: tip |
|
329 | tag: tip | |
330 |
parent: 3: |
|
330 | parent: 3:eebf5a27f8ca | |
331 | user: test |
|
331 | user: test | |
332 |
date: |
|
332 | date: Thu Jan 01 00:00:00 1970 +0000 | |
333 | summary: 0.3m |
|
333 | summary: 0.3m | |
334 |
|
334 | |||
335 |
|
335 | |||
@@ -338,32 +338,32 b' Outgoing -R full.hg vs partial2 in parti' | |||||
338 | $ hg -R bundle://../full.hg outgoing ../partial2 |
|
338 | $ hg -R bundle://../full.hg outgoing ../partial2 | |
339 | comparing with ../partial2 |
|
339 | comparing with ../partial2 | |
340 | searching for changes |
|
340 | searching for changes | |
341 |
changeset: 4: |
|
341 | changeset: 4:095197eb4973 | |
342 |
parent: 0:56 |
|
342 | parent: 0:f9ee2f85a263 | |
343 | user: test |
|
343 | user: test | |
344 |
date: |
|
344 | date: Thu Jan 01 00:00:00 1970 +0000 | |
345 | summary: 1.1 |
|
345 | summary: 1.1 | |
346 |
|
346 | |||
347 |
changeset: 5: |
|
347 | changeset: 5:1bb50a9436a7 | |
348 | user: test |
|
348 | user: test | |
349 |
date: |
|
349 | date: Thu Jan 01 00:00:00 1970 +0000 | |
350 | summary: 1.2 |
|
350 | summary: 1.2 | |
351 |
|
351 | |||
352 |
changeset: 6: |
|
352 | changeset: 6:7373c1169842 | |
353 | user: test |
|
353 | user: test | |
354 |
date: |
|
354 | date: Thu Jan 01 00:00:00 1970 +0000 | |
355 | summary: 1.3 |
|
355 | summary: 1.3 | |
356 |
|
356 | |||
357 |
changeset: 7: |
|
357 | changeset: 7:a6a34bfa0076 | |
358 | user: test |
|
358 | user: test | |
359 |
date: |
|
359 | date: Thu Jan 01 00:00:00 1970 +0000 | |
360 | summary: 1.3m |
|
360 | summary: 1.3m | |
361 |
|
361 | |||
362 |
changeset: 8: |
|
362 | changeset: 8:aa35859c02ea | |
363 | tag: tip |
|
363 | tag: tip | |
364 |
parent: 3: |
|
364 | parent: 3:eebf5a27f8ca | |
365 | user: test |
|
365 | user: test | |
366 |
date: |
|
366 | date: Thu Jan 01 00:00:00 1970 +0000 | |
367 | summary: 0.3m |
|
367 | summary: 0.3m | |
368 |
|
368 | |||
369 |
|
369 | |||
@@ -384,16 +384,16 b' Direct clone from bundle (all-history)' | |||||
384 | updating to branch default |
|
384 | updating to branch default | |
385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
385 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
386 | $ hg -R full-clone heads |
|
386 | $ hg -R full-clone heads | |
387 |
changeset: 8: |
|
387 | changeset: 8:aa35859c02ea | |
388 | tag: tip |
|
388 | tag: tip | |
389 |
parent: 3: |
|
389 | parent: 3:eebf5a27f8ca | |
390 | user: test |
|
390 | user: test | |
391 |
date: |
|
391 | date: Thu Jan 01 00:00:00 1970 +0000 | |
392 | summary: 0.3m |
|
392 | summary: 0.3m | |
393 |
|
393 | |||
394 |
changeset: 7: |
|
394 | changeset: 7:a6a34bfa0076 | |
395 | user: test |
|
395 | user: test | |
396 |
date: |
|
396 | date: Thu Jan 01 00:00:00 1970 +0000 | |
397 | summary: 1.3m |
|
397 | summary: 1.3m | |
398 |
|
398 | |||
399 | $ rm -r full-clone |
|
399 | $ rm -r full-clone | |
@@ -482,8 +482,8 b' diff against bundle' | |||||
482 | $ hg init b |
|
482 | $ hg init b | |
483 | $ cd b |
|
483 | $ cd b | |
484 | $ hg -R ../all.hg diff -r tip |
|
484 | $ hg -R ../all.hg diff -r tip | |
485 |
diff -r |
|
485 | diff -r aa35859c02ea anotherfile | |
486 |
--- a/anotherfile |
|
486 | --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000 | |
487 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
487 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
488 | @@ -1,4 +0,0 @@ |
|
488 | @@ -1,4 +0,0 @@ | |
489 | -0 |
|
489 | -0 |
@@ -1,9 +1,7 b'' | |||||
1 | $ mkdir t |
|
|||
2 | $ cd t |
|
|||
3 |
|
|
1 | $ hg init | |
4 | $ echo 0 > a |
|
2 | $ echo 0 > a | |
5 | $ echo 0 > b |
|
3 | $ echo 0 > b | |
6 |
$ hg ci -A -m m |
|
4 | $ hg ci -A -m m | |
7 | adding a |
|
5 | adding a | |
8 | adding b |
|
6 | adding b | |
9 | $ hg rm a |
|
7 | $ hg rm a | |
@@ -12,13 +10,13 b'' | |||||
12 | $ hg cat --decode a # more tests in test-encode |
|
10 | $ hg cat --decode a # more tests in test-encode | |
13 | 0 |
|
11 | 0 | |
14 | $ echo 1 > b |
|
12 | $ echo 1 > b | |
15 |
$ hg ci -m m |
|
13 | $ hg ci -m m | |
16 |
$ |
|
14 | $ echo 2 > b | |
17 |
$ |
|
15 | $ hg cat -r 0 a | |
18 | 0 |
|
16 | 0 | |
19 | $ hg cat -r 0 b |
|
17 | $ hg cat -r 0 b | |
20 | 0 |
|
18 | 0 | |
21 | $ hg cat -r 1 a |
|
19 | $ hg cat -r 1 a | |
22 |
a: no such file in rev |
|
20 | a: no such file in rev 7040230c159c | |
23 | $ hg cat -r 1 b |
|
21 | $ hg cat -r 1 b | |
24 | 1 |
|
22 | 1 |
@@ -23,9 +23,9 b' commit added file that has been deleted' | |||||
23 | $ echo bar > bar |
|
23 | $ echo bar > bar | |
24 | $ hg add bar |
|
24 | $ hg add bar | |
25 | $ rm bar |
|
25 | $ rm bar | |
26 |
$ hg commit - |
|
26 | $ hg commit -m commit-8 | |
27 | nothing changed |
|
27 | nothing changed | |
28 |
$ hg commit |
|
28 | $ hg commit -m commit-8-2 bar | |
29 | abort: bar: file not found! |
|
29 | abort: bar: file not found! | |
30 |
|
30 | |||
31 | $ hg -q revert -a --no-backup |
|
31 | $ hg -q revert -a --no-backup | |
@@ -89,15 +89,15 b' partial subdir commit test' | |||||
89 | $ hg add |
|
89 | $ hg add | |
90 | adding bar/bar |
|
90 | adding bar/bar | |
91 | adding foo/foo |
|
91 | adding foo/foo | |
92 |
$ hg ci |
|
92 | $ hg ci -m commit-subdir-1 foo | |
93 |
$ hg ci |
|
93 | $ hg ci -m commit-subdir-2 bar | |
94 |
|
94 | |||
95 | subdir log 1 |
|
95 | subdir log 1 | |
96 |
|
96 | |||
97 | $ hg log -v foo |
|
97 | $ hg log -v foo | |
98 |
changeset: 0: |
|
98 | changeset: 0:f97e73a25882 | |
99 | user: test |
|
99 | user: test | |
100 |
date: |
|
100 | date: Thu Jan 01 00:00:00 1970 +0000 | |
101 | files: foo/foo |
|
101 | files: foo/foo | |
102 | description: |
|
102 | description: | |
103 | commit-subdir-1 |
|
103 | commit-subdir-1 | |
@@ -107,10 +107,10 b' subdir log 1' | |||||
107 | subdir log 2 |
|
107 | subdir log 2 | |
108 |
|
108 | |||
109 | $ hg log -v bar |
|
109 | $ hg log -v bar | |
110 |
changeset: 1: |
|
110 | changeset: 1:aa809156d50d | |
111 | tag: tip |
|
111 | tag: tip | |
112 | user: test |
|
112 | user: test | |
113 |
date: |
|
113 | date: Thu Jan 01 00:00:00 1970 +0000 | |
114 | files: bar/bar |
|
114 | files: bar/bar | |
115 | description: |
|
115 | description: | |
116 | commit-subdir-2 |
|
116 | commit-subdir-2 | |
@@ -120,18 +120,18 b' subdir log 2' | |||||
120 | full log |
|
120 | full log | |
121 |
|
121 | |||
122 | $ hg log -v |
|
122 | $ hg log -v | |
123 |
changeset: 1: |
|
123 | changeset: 1:aa809156d50d | |
124 | tag: tip |
|
124 | tag: tip | |
125 | user: test |
|
125 | user: test | |
126 |
date: |
|
126 | date: Thu Jan 01 00:00:00 1970 +0000 | |
127 | files: bar/bar |
|
127 | files: bar/bar | |
128 | description: |
|
128 | description: | |
129 | commit-subdir-2 |
|
129 | commit-subdir-2 | |
130 |
|
130 | |||
131 |
|
131 | |||
132 |
changeset: 0: |
|
132 | changeset: 0:f97e73a25882 | |
133 | user: test |
|
133 | user: test | |
134 |
date: |
|
134 | date: Thu Jan 01 00:00:00 1970 +0000 | |
135 | files: foo/foo |
|
135 | files: foo/foo | |
136 | description: |
|
136 | description: | |
137 | commit-subdir-1 |
|
137 | commit-subdir-1 | |
@@ -147,25 +147,25 b' dot and subdir commit test' | |||||
147 | $ mkdir foo |
|
147 | $ mkdir foo | |
148 | $ echo foo content > foo/plain-file |
|
148 | $ echo foo content > foo/plain-file | |
149 | $ hg add foo/plain-file |
|
149 | $ hg add foo/plain-file | |
150 |
$ hg ci |
|
150 | $ hg ci -m commit-foo-subdir foo | |
151 | $ echo modified foo content > foo/plain-file |
|
151 | $ echo modified foo content > foo/plain-file | |
152 |
$ hg ci |
|
152 | $ hg ci -m commit-foo-dot . | |
153 |
|
153 | |||
154 | full log |
|
154 | full log | |
155 |
|
155 | |||
156 | $ hg log -v |
|
156 | $ hg log -v | |
157 |
changeset: 1: |
|
157 | changeset: 1:95b38e3a5b2e | |
158 | tag: tip |
|
158 | tag: tip | |
159 | user: test |
|
159 | user: test | |
160 |
date: |
|
160 | date: Thu Jan 01 00:00:00 1970 +0000 | |
161 | files: foo/plain-file |
|
161 | files: foo/plain-file | |
162 | description: |
|
162 | description: | |
163 | commit-foo-dot |
|
163 | commit-foo-dot | |
164 |
|
164 | |||
165 |
|
165 | |||
166 |
changeset: 0: |
|
166 | changeset: 0:65d4e9386227 | |
167 | user: test |
|
167 | user: test | |
168 |
date: |
|
168 | date: Thu Jan 01 00:00:00 1970 +0000 | |
169 | files: foo/plain-file |
|
169 | files: foo/plain-file | |
170 | description: |
|
170 | description: | |
171 | commit-foo-subdir |
|
171 | commit-foo-subdir | |
@@ -176,15 +176,15 b' subdir log' | |||||
176 |
|
176 | |||
177 | $ cd foo |
|
177 | $ cd foo | |
178 | $ hg log . |
|
178 | $ hg log . | |
179 |
changeset: 1: |
|
179 | changeset: 1:95b38e3a5b2e | |
180 | tag: tip |
|
180 | tag: tip | |
181 | user: test |
|
181 | user: test | |
182 |
date: |
|
182 | date: Thu Jan 01 00:00:00 1970 +0000 | |
183 | summary: commit-foo-dot |
|
183 | summary: commit-foo-dot | |
184 |
|
184 | |||
185 |
changeset: 0: |
|
185 | changeset: 0:65d4e9386227 | |
186 | user: test |
|
186 | user: test | |
187 |
date: |
|
187 | date: Thu Jan 01 00:00:00 1970 +0000 | |
188 | summary: commit-foo-subdir |
|
188 | summary: commit-foo-subdir | |
189 |
|
189 | |||
190 | $ cd .. |
|
190 | $ cd .. |
@@ -6,56 +6,56 b'' | |||||
6 | $ cd test |
|
6 | $ cd test | |
7 | $ touch asdf |
|
7 | $ touch asdf | |
8 | $ hg add asdf |
|
8 | $ hg add asdf | |
9 |
$ hg commit - |
|
9 | $ hg commit -m commit-1 | |
10 | $ hg tip |
|
10 | $ hg tip | |
11 |
changeset: 0: |
|
11 | changeset: 0:53f268a58230 | |
12 | tag: tip |
|
12 | tag: tip | |
13 | user: My Name <myname@example.com> |
|
13 | user: My Name <myname@example.com> | |
14 |
date: |
|
14 | date: Thu Jan 01 00:00:00 1970 +0000 | |
15 | summary: commit-1 |
|
15 | summary: commit-1 | |
16 |
|
16 | |||
17 |
|
17 | |||
18 | $ unset EMAIL |
|
18 | $ unset EMAIL | |
19 | $ echo 1234 > asdf |
|
19 | $ echo 1234 > asdf | |
20 |
$ hg commit |
|
20 | $ hg commit -u "foo@bar.com" -m commit-1 | |
21 | $ hg tip |
|
21 | $ hg tip | |
22 |
changeset: 1: |
|
22 | changeset: 1:3871b2a9e9bf | |
23 | tag: tip |
|
23 | tag: tip | |
24 | user: foo@bar.com |
|
24 | user: foo@bar.com | |
25 |
date: |
|
25 | date: Thu Jan 01 00:00:00 1970 +0000 | |
26 | summary: commit-1 |
|
26 | summary: commit-1 | |
27 |
|
27 | |||
28 | $ echo "[ui]" >> .hg/hgrc |
|
28 | $ echo "[ui]" >> .hg/hgrc | |
29 | $ echo "username = foobar <foo@bar.com>" >> .hg/hgrc |
|
29 | $ echo "username = foobar <foo@bar.com>" >> .hg/hgrc | |
30 | $ echo 12 > asdf |
|
30 | $ echo 12 > asdf | |
31 |
$ hg commit - |
|
31 | $ hg commit -m commit-1 | |
32 | $ hg tip |
|
32 | $ hg tip | |
33 |
changeset: 2: |
|
33 | changeset: 2:8eeac6695c1c | |
34 | tag: tip |
|
34 | tag: tip | |
35 | user: foobar <foo@bar.com> |
|
35 | user: foobar <foo@bar.com> | |
36 |
date: |
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 | |
37 | summary: commit-1 |
|
37 | summary: commit-1 | |
38 |
|
38 | |||
39 | $ echo 1 > asdf |
|
39 | $ echo 1 > asdf | |
40 |
$ hg commit |
|
40 | $ hg commit -u "foo@bar.com" -m commit-1 | |
41 | $ hg tip |
|
41 | $ hg tip | |
42 |
changeset: 3: |
|
42 | changeset: 3:957606a725e4 | |
43 | tag: tip |
|
43 | tag: tip | |
44 | user: foo@bar.com |
|
44 | user: foo@bar.com | |
45 |
date: |
|
45 | date: Thu Jan 01 00:00:00 1970 +0000 | |
46 | summary: commit-1 |
|
46 | summary: commit-1 | |
47 |
|
47 | |||
48 | $ echo 123 > asdf |
|
48 | $ echo 123 > asdf | |
49 | $ echo "[ui]" > .hg/hgrc |
|
49 | $ echo "[ui]" > .hg/hgrc | |
50 | $ echo "username = " >> .hg/hgrc |
|
50 | $ echo "username = " >> .hg/hgrc | |
51 |
$ hg commit - |
|
51 | $ hg commit -m commit-1 | |
52 | abort: no username supplied (see "hg help config") |
|
52 | abort: no username supplied (see "hg help config") | |
53 | $ rm .hg/hgrc |
|
53 | $ rm .hg/hgrc | |
54 |
$ hg commit |
|
54 | $ hg commit -m commit-1 2>&1 | |
55 | No username found, using '[^']*' instead |
|
55 | No username found, using '[^']*' instead | |
56 |
|
56 | |||
57 | $ echo space > asdf |
|
57 | $ echo space > asdf | |
58 |
$ hg commit - |
|
58 | $ hg commit -u ' ' -m commit-1 | |
59 | transaction abort! |
|
59 | transaction abort! | |
60 | rollback completed |
|
60 | rollback completed | |
61 | abort: empty username! |
|
61 | abort: empty username! |
@@ -1,13 +1,13 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ echo "nothing" > a |
|
2 | $ echo "nothing" > a | |
3 | $ hg add a |
|
3 | $ hg add a | |
4 |
$ hg commit -m ancestor |
|
4 | $ hg commit -m ancestor | |
5 |
$ |
|
5 | $ echo "something" > a | |
6 |
$ |
|
6 | $ hg commit -m branch1 | |
7 |
$ |
|
7 | $ hg co 0 | |
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | $ echo "something else" > a |
|
9 | $ echo "something else" > a | |
10 |
$ hg commit -m branch2 |
|
10 | $ hg commit -m branch2 | |
11 | created new head |
|
11 | created new head | |
12 |
|
12 | |||
13 | $ hg merge 1 |
|
13 | $ hg merge 1 | |
@@ -18,7 +18,7 b'' | |||||
18 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
18 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
19 |
|
19 | |||
20 | $ hg id |
|
20 | $ hg id | |
21 | e7fe8eb3e180+0d24b7662d3e+ tip |
|
21 | 32e80765d7fe+75234512624c+ tip | |
22 |
|
22 | |||
23 | $ cat a |
|
23 | $ cat a | |
24 | <<<<<<< local |
|
24 | <<<<<<< local |
@@ -3,7 +3,7 b'' | |||||
3 | hg init |
|
3 | hg init | |
4 | echo foo > a |
|
4 | echo foo > a | |
5 | hg add a |
|
5 | hg add a | |
6 |
hg commit -m "1" |
|
6 | hg commit -m "1" | |
7 |
|
7 | |||
8 | echo bar > b |
|
8 | echo bar > b | |
9 | hg add b |
|
9 | hg add b | |
@@ -22,11 +22,11 b' rm b' | |||||
22 |
|
22 | |||
23 | hg co -C 0 |
|
23 | hg co -C 0 | |
24 | echo foo-a > a |
|
24 | echo foo-a > a | |
25 |
hg commit -m "2a" |
|
25 | hg commit -m "2a" | |
26 |
|
26 | |||
27 | hg co -C 0 |
|
27 | hg co -C 0 | |
28 | echo foo-b > a |
|
28 | echo foo-b > a | |
29 |
hg commit -m "2b" |
|
29 | hg commit -m "2b" | |
30 |
|
30 | |||
31 | HGMERGE=true hg merge 1 |
|
31 | HGMERGE=true hg merge 1 | |
32 |
|
32 |
@@ -3,14 +3,14 b'' | |||||
3 | $ hg init |
|
3 | $ hg init | |
4 |
|
4 | |||
5 | $ echo 1 > a |
|
5 | $ echo 1 > a | |
6 |
$ hg ci -qAm "first" |
|
6 | $ hg ci -qAm "first" | |
7 |
|
7 | |||
8 | $ hg cp a b |
|
8 | $ hg cp a b | |
9 | $ hg mv a c |
|
9 | $ hg mv a c | |
10 | $ echo 2 >> b |
|
10 | $ echo 2 >> b | |
11 | $ echo 2 >> c |
|
11 | $ echo 2 >> c | |
12 |
|
12 | |||
13 |
$ hg ci -qAm "second" |
|
13 | $ hg ci -qAm "second" | |
14 |
|
14 | |||
15 | $ hg co -C 0 |
|
15 | $ hg co -C 0 | |
16 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
16 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
@@ -18,7 +18,7 b'' | |||||
18 | $ echo 0 > a |
|
18 | $ echo 0 > a | |
19 | $ echo 1 >> a |
|
19 | $ echo 1 >> a | |
20 |
|
20 | |||
21 |
$ hg ci -qAm "other" |
|
21 | $ hg ci -qAm "other" | |
22 |
|
22 | |||
23 | $ hg merge --debug |
|
23 | $ hg merge --debug | |
24 | searching for copies back to rev 1 |
|
24 | searching for copies back to rev 1 | |
@@ -31,7 +31,7 b'' | |||||
31 | checking for directory renames |
|
31 | checking for directory renames | |
32 | resolving manifests |
|
32 | resolving manifests | |
33 | overwrite None partial False |
|
33 | overwrite None partial False | |
34 | ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659 |
|
34 | ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6 | |
35 | a: remote moved to c -> m |
|
35 | a: remote moved to c -> m | |
36 | a: remote moved to b -> m |
|
36 | a: remote moved to b -> m | |
37 | preserving a for resolve of b |
|
37 | preserving a for resolve of b | |
@@ -40,12 +40,12 b'' | |||||
40 | updating: a 1/2 files (50.00%) |
|
40 | updating: a 1/2 files (50.00%) | |
41 | picked tool 'internal:merge' for b (binary False symlink False) |
|
41 | picked tool 'internal:merge' for b (binary False symlink False) | |
42 | merging a and b to b |
|
42 | merging a and b to b | |
43 | my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052 |
|
43 | my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc | |
44 | premerge successful |
|
44 | premerge successful | |
45 | updating: a 2/2 files (100.00%) |
|
45 | updating: a 2/2 files (100.00%) | |
46 | picked tool 'internal:merge' for c (binary False symlink False) |
|
46 | picked tool 'internal:merge' for c (binary False symlink False) | |
47 | merging a and c to c |
|
47 | merging a and c to c | |
48 | my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052 |
|
48 | my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc | |
49 | premerge successful |
|
49 | premerge successful | |
50 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
50 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
51 | (branch merge, don't forget to commit) |
|
51 | (branch merge, don't forget to commit) |
@@ -1,37 +1,37 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ echo a > a |
|
2 | $ echo a > a | |
3 | $ hg add a |
|
3 | $ hg add a | |
4 |
$ hg commit -m "1" |
|
4 | $ hg commit -m "1" | |
5 | $ hg status |
|
5 | $ hg status | |
6 | $ hg copy a b |
|
6 | $ hg copy a b | |
7 | $ hg status |
|
7 | $ hg status | |
8 | A b |
|
8 | A b | |
9 | $ hg sum |
|
9 | $ hg sum | |
10 |
parent: 0: |
|
10 | parent: 0:c19d34741b0a tip | |
11 | 1 |
|
11 | 1 | |
12 | branch: default |
|
12 | branch: default | |
13 | commit: 1 copied |
|
13 | commit: 1 copied | |
14 | update: (current) |
|
14 | update: (current) | |
15 |
$ hg --debug commit -m "2" |
|
15 | $ hg --debug commit -m "2" | |
16 | b |
|
16 | b | |
17 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
17 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
18 | committed changeset 1:76973b01f66a012648546c979ea4c41de9e7d8cd |
|
18 | committed changeset 1:93580a2c28a50a56f63526fb305067e6fbf739c4 | |
19 |
|
19 | |||
20 | we should see two history entries |
|
20 | we should see two history entries | |
21 |
|
21 | |||
22 | $ hg history -v |
|
22 | $ hg history -v | |
23 |
changeset: 1: |
|
23 | changeset: 1:93580a2c28a5 | |
24 | tag: tip |
|
24 | tag: tip | |
25 | user: test |
|
25 | user: test | |
26 |
date: |
|
26 | date: Thu Jan 01 00:00:00 1970 +0000 | |
27 | files: b |
|
27 | files: b | |
28 | description: |
|
28 | description: | |
29 | 2 |
|
29 | 2 | |
30 |
|
30 | |||
31 |
|
31 | |||
32 |
changeset: 0: |
|
32 | changeset: 0:c19d34741b0a | |
33 | user: test |
|
33 | user: test | |
34 |
date: |
|
34 | date: Thu Jan 01 00:00:00 1970 +0000 | |
35 | files: a |
|
35 | files: a | |
36 | description: |
|
36 | description: | |
37 | 1 |
|
37 | 1 | |
@@ -41,9 +41,9 b' we should see two history entries' | |||||
41 | we should see one log entry for a |
|
41 | we should see one log entry for a | |
42 |
|
42 | |||
43 | $ hg log a |
|
43 | $ hg log a | |
44 |
changeset: 0: |
|
44 | changeset: 0:c19d34741b0a | |
45 | user: test |
|
45 | user: test | |
46 |
date: |
|
46 | date: Thu Jan 01 00:00:00 1970 +0000 | |
47 | summary: 1 |
|
47 | summary: 1 | |
48 |
|
48 | |||
49 |
|
49 | |||
@@ -56,10 +56,10 b' this should show a revision linked to ch' | |||||
56 | we should see one log entry for b |
|
56 | we should see one log entry for b | |
57 |
|
57 | |||
58 | $ hg log b |
|
58 | $ hg log b | |
59 |
changeset: 1: |
|
59 | changeset: 1:93580a2c28a5 | |
60 | tag: tip |
|
60 | tag: tip | |
61 | user: test |
|
61 | user: test | |
62 |
date: |
|
62 | date: Thu Jan 01 00:00:00 1970 +0000 | |
63 | summary: 2 |
|
63 | summary: 2 | |
64 |
|
64 | |||
65 |
|
65 |
@@ -7,38 +7,38 b'' | |||||
7 |
|
7 | |||
8 | $ echo bar > foo |
|
8 | $ echo bar > foo | |
9 | $ hg add foo |
|
9 | $ hg add foo | |
10 |
$ hg ci -m 'add foo' |
|
10 | $ hg ci -m 'add foo' | |
11 |
|
11 | |||
12 | $ echo foobar > foo |
|
12 | $ echo foobar > foo | |
13 |
$ hg ci -m 'change foo' |
|
13 | $ hg ci -m 'change foo' | |
14 |
|
14 | |||
15 | $ hg --quiet diff -r 0 -r 1 |
|
15 | $ hg --quiet diff -r 0 -r 1 | |
16 |
--- a/foo |
|
16 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
17 |
+++ b/foo |
|
17 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
18 | @@ -1,1 +1,1 @@ |
|
18 | @@ -1,1 +1,1 @@ | |
19 | -bar |
|
19 | -bar | |
20 | +foobar |
|
20 | +foobar | |
21 |
|
21 | |||
22 | $ hg diff -r 0 -r 1 |
|
22 | $ hg diff -r 0 -r 1 | |
23 | diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
|
23 | diff -r a99fb63adac3 -r 9b8568d3af2f foo | |
24 |
--- a/foo |
|
24 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
25 |
+++ b/foo |
|
25 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
26 | @@ -1,1 +1,1 @@ |
|
26 | @@ -1,1 +1,1 @@ | |
27 | -bar |
|
27 | -bar | |
28 | +foobar |
|
28 | +foobar | |
29 |
|
29 | |||
30 | $ hg --verbose diff -r 0 -r 1 |
|
30 | $ hg --verbose diff -r 0 -r 1 | |
31 | diff -r 74de3f1392e2 -r b8b5f023a6ad foo |
|
31 | diff -r a99fb63adac3 -r 9b8568d3af2f foo | |
32 |
--- a/foo |
|
32 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
33 |
+++ b/foo |
|
33 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
34 | @@ -1,1 +1,1 @@ |
|
34 | @@ -1,1 +1,1 @@ | |
35 | -bar |
|
35 | -bar | |
36 | +foobar |
|
36 | +foobar | |
37 |
|
37 | |||
38 | $ hg --debug diff -r 0 -r 1 |
|
38 | $ hg --debug diff -r 0 -r 1 | |
39 | diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo |
|
39 | diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo | |
40 |
--- a/foo |
|
40 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 | |
41 |
+++ b/foo |
|
41 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |
42 | @@ -1,1 +1,1 @@ |
|
42 | @@ -1,1 +1,1 @@ | |
43 | -bar |
|
43 | -bar | |
44 | +foobar |
|
44 | +foobar |
@@ -1,19 +1,19 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ touch a |
|
2 | $ touch a | |
3 | $ hg add a |
|
3 | $ hg add a | |
4 |
$ hg ci -m "a" |
|
4 | $ hg ci -m "a" | |
5 |
|
5 | |||
6 | $ echo 123 > b |
|
6 | $ echo 123 > b | |
7 | $ hg add b |
|
7 | $ hg add b | |
8 | $ hg diff --nodates |
|
8 | $ hg diff --nodates | |
9 |
diff -r |
|
9 | diff -r 3903775176ed b | |
10 | --- /dev/null |
|
10 | --- /dev/null | |
11 | +++ b/b |
|
11 | +++ b/b | |
12 | @@ -0,0 +1,1 @@ |
|
12 | @@ -0,0 +1,1 @@ | |
13 | +123 |
|
13 | +123 | |
14 |
|
14 | |||
15 | $ hg diff --nodates -r tip |
|
15 | $ hg diff --nodates -r tip | |
16 |
diff -r |
|
16 | diff -r 3903775176ed b | |
17 | --- /dev/null |
|
17 | --- /dev/null | |
18 | +++ b/b |
|
18 | +++ b/b | |
19 | @@ -0,0 +1,1 @@ |
|
19 | @@ -0,0 +1,1 @@ | |
@@ -21,12 +21,12 b'' | |||||
21 |
|
21 | |||
22 | $ echo foo > a |
|
22 | $ echo foo > a | |
23 | $ hg diff --nodates |
|
23 | $ hg diff --nodates | |
24 |
diff -r |
|
24 | diff -r 3903775176ed a | |
25 | --- a/a |
|
25 | --- a/a | |
26 | +++ b/a |
|
26 | +++ b/a | |
27 | @@ -0,0 +1,1 @@ |
|
27 | @@ -0,0 +1,1 @@ | |
28 | +foo |
|
28 | +foo | |
29 |
diff -r |
|
29 | diff -r 3903775176ed b | |
30 | --- /dev/null |
|
30 | --- /dev/null | |
31 | +++ b/b |
|
31 | +++ b/b | |
32 | @@ -0,0 +1,1 @@ |
|
32 | @@ -0,0 +1,1 @@ |
@@ -2,27 +2,27 b'' | |||||
2 | $ cd repo |
|
2 | $ cd repo | |
3 |
|
3 | |||
4 | $ echo line 1 > foo |
|
4 | $ echo line 1 > foo | |
5 |
$ hg ci -qAm 'add foo' |
|
5 | $ hg ci -qAm 'add foo' | |
6 |
|
6 | |||
7 | copy foo to bar and change both files |
|
7 | copy foo to bar and change both files | |
8 | $ hg cp foo bar |
|
8 | $ hg cp foo bar | |
9 | $ echo line 2-1 >> foo |
|
9 | $ echo line 2-1 >> foo | |
10 | $ echo line 2-2 >> bar |
|
10 | $ echo line 2-2 >> bar | |
11 |
$ hg ci -m 'cp foo bar; change both' |
|
11 | $ hg ci -m 'cp foo bar; change both' | |
12 |
|
12 | |||
13 | in another branch, change foo in a way that doesn't conflict with |
|
13 | in another branch, change foo in a way that doesn't conflict with | |
14 | the other changes |
|
14 | the other changes | |
15 | $ hg up -qC 0 |
|
15 | $ hg up -qC 0 | |
16 | $ echo line 0 > foo |
|
16 | $ echo line 0 > foo | |
17 | $ hg cat foo >> foo |
|
17 | $ hg cat foo >> foo | |
18 |
$ hg ci -m 'change foo' |
|
18 | $ hg ci -m 'change foo' | |
19 | created new head |
|
19 | created new head | |
20 |
|
20 | |||
21 | we get conflicts that shouldn't be there |
|
21 | we get conflicts that shouldn't be there | |
22 | $ hg merge -P |
|
22 | $ hg merge -P | |
23 |
changeset: 1: |
|
23 | changeset: 1:484bf6903104 | |
24 | user: test |
|
24 | user: test | |
25 |
date: |
|
25 | date: Thu Jan 01 00:00:00 1970 +0000 | |
26 | summary: cp foo bar; change both |
|
26 | summary: cp foo bar; change both | |
27 |
|
27 | |||
28 | $ hg merge --debug |
|
28 | $ hg merge --debug | |
@@ -34,7 +34,7 b" we get conflicts that shouldn't be there" | |||||
34 | checking for directory renames |
|
34 | checking for directory renames | |
35 | resolving manifests |
|
35 | resolving manifests | |
36 | overwrite None partial False |
|
36 | overwrite None partial False | |
37 | ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf |
|
37 | ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104 | |
38 | foo: versions differ -> m |
|
38 | foo: versions differ -> m | |
39 | foo: remote copied to bar -> m |
|
39 | foo: remote copied to bar -> m | |
40 | preserving foo for resolve of bar |
|
40 | preserving foo for resolve of bar | |
@@ -42,12 +42,12 b" we get conflicts that shouldn't be there" | |||||
42 | updating: foo 1/2 files (50.00%) |
|
42 | updating: foo 1/2 files (50.00%) | |
43 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
43 | picked tool 'internal:merge' for bar (binary False symlink False) | |
44 | merging foo and bar to bar |
|
44 | merging foo and bar to bar | |
45 | my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da |
|
45 | my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc | |
46 | premerge successful |
|
46 | premerge successful | |
47 | updating: foo 2/2 files (100.00%) |
|
47 | updating: foo 2/2 files (100.00%) | |
48 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
48 | picked tool 'internal:merge' for foo (binary False symlink False) | |
49 | merging foo |
|
49 | merging foo | |
50 | my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da |
|
50 | my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc | |
51 | premerge successful |
|
51 | premerge successful | |
52 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
52 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
53 | (branch merge, don't forget to commit) |
|
53 | (branch merge, don't forget to commit) |
@@ -3,11 +3,11 b'' | |||||
3 | hg init |
|
3 | hg init | |
4 | echo 123 > a |
|
4 | echo 123 > a | |
5 | hg add a |
|
5 | hg add a | |
6 |
hg commit -m "first" |
|
6 | hg commit -m "first" a | |
7 | mkdir sub |
|
7 | mkdir sub | |
8 | echo 321 > sub/b |
|
8 | echo 321 > sub/b | |
9 | hg add sub/b |
|
9 | hg add sub/b | |
10 |
hg commit -m "second" |
|
10 | hg commit -m "second" sub/b | |
11 | cat sub/b |
|
11 | cat sub/b | |
12 | hg co 0 |
|
12 | hg co 0 | |
13 | cat sub/b 2>/dev/null || echo "sub/b not present" |
|
13 | cat sub/b 2>/dev/null || echo "sub/b not present" |
@@ -4,16 +4,16 b' hg init a' | |||||
4 | cd a |
|
4 | cd a | |
5 | touch empty1 |
|
5 | touch empty1 | |
6 | hg add empty1 |
|
6 | hg add empty1 | |
7 |
hg commit -m 'add empty1' |
|
7 | hg commit -m 'add empty1' | |
8 |
|
8 | |||
9 | touch empty2 |
|
9 | touch empty2 | |
10 | hg add empty2 |
|
10 | hg add empty2 | |
11 |
hg commit -m 'add empty2' |
|
11 | hg commit -m 'add empty2' | |
12 |
|
12 | |||
13 | hg up -C 0 |
|
13 | hg up -C 0 | |
14 | touch empty3 |
|
14 | touch empty3 | |
15 | hg add empty3 |
|
15 | hg add empty3 | |
16 |
hg commit -m 'add empty3' |
|
16 | hg commit -m 'add empty3' | |
17 |
|
17 | |||
18 | hg heads |
|
18 | hg heads | |
19 |
|
19 | |||
@@ -21,5 +21,5 b' hg merge 1' | |||||
21 | # before changeset 05257fd28591, we didn't notice the |
|
21 | # before changeset 05257fd28591, we didn't notice the | |
22 | # empty file that came from rev 1. |
|
22 | # empty file that came from rev 1. | |
23 | hg status |
|
23 | hg status | |
24 |
hg commit -m merge |
|
24 | hg commit -m merge | |
25 | hg manifest --debug tip |
|
25 | hg manifest --debug tip |
@@ -1,15 +1,15 b'' | |||||
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2 | created new head |
|
2 | created new head | |
3 |
changeset: 2: |
|
3 | changeset: 2:a1cb177e0d44 | |
4 | tag: tip |
|
4 | tag: tip | |
5 |
parent: 0: |
|
5 | parent: 0:1e1d9c4e5b64 | |
6 | user: test |
|
6 | user: test | |
7 |
date: |
|
7 | date: Thu Jan 01 00:00:00 1970 +0000 | |
8 | summary: add empty3 |
|
8 | summary: add empty3 | |
9 |
|
9 | |||
10 |
changeset: 1: |
|
10 | changeset: 1:097d2b0e17f6 | |
11 | user: test |
|
11 | user: test | |
12 |
date: |
|
12 | date: Thu Jan 01 00:00:00 1970 +0000 | |
13 | summary: add empty2 |
|
13 | summary: add empty2 | |
14 |
|
14 | |||
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -21,19 +21,19 b'' | |||||
21 | hg init a |
|
21 | hg init a | |
22 | cd a |
|
22 | cd a | |
23 | touch init |
|
23 | touch init | |
24 |
hg ci -A -m 0 |
|
24 | hg ci -A -m 0 | |
25 | touch x y |
|
25 | touch x y | |
26 |
hg ci -A -m 1 |
|
26 | hg ci -A -m 1 | |
27 | hg update 0 |
|
27 | hg update 0 | |
28 | touch x y |
|
28 | touch x y | |
29 |
hg ci -A -m 2 |
|
29 | hg ci -A -m 2 | |
30 | hg merge 1 |
|
30 | hg merge 1 | |
31 |
hg ci -A -m m1 |
|
31 | hg ci -A -m m1 | |
32 | #hg log |
|
32 | #hg log | |
33 | #hg debugindex .hg/store/00manifest.i |
|
33 | #hg debugindex .hg/store/00manifest.i | |
34 | hg update -C 1 |
|
34 | hg update -C 1 | |
35 | hg merge 2 |
|
35 | hg merge 2 | |
36 |
hg ci -A -m m2 |
|
36 | hg ci -A -m m2 | |
37 | #hg log |
|
37 | #hg log | |
38 | #hg debugindex .hg/store/00manifest.i |
|
38 | #hg debugindex .hg/store/00manifest.i | |
39 |
|
39 |
@@ -27,41 +27,41 b' updating to branch default' | |||||
27 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | comparing with b |
|
28 | comparing with b | |
29 | searching for changes |
|
29 | searching for changes | |
30 |
changeset: 4: |
|
30 | changeset: 4:119caaef4ed1 | |
31 | tag: tip |
|
31 | tag: tip | |
32 |
parent: 1: |
|
32 | parent: 1:79f9e10cd04e | |
33 |
parent: 2: |
|
33 | parent: 2:8e1bb01c1a24 | |
34 | user: test |
|
34 | user: test | |
35 |
date: |
|
35 | date: Thu Jan 01 00:00:00 1970 +0000 | |
36 | summary: m2 |
|
36 | summary: m2 | |
37 |
|
37 | |||
38 | comparing with c |
|
38 | comparing with c | |
39 | searching for changes |
|
39 | searching for changes | |
40 |
changeset: 3: |
|
40 | changeset: 3:cbb48b367d1b | |
41 |
parent: 2: |
|
41 | parent: 2:8e1bb01c1a24 | |
42 |
parent: 1: |
|
42 | parent: 1:79f9e10cd04e | |
43 | user: test |
|
43 | user: test | |
44 |
date: |
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 | |
45 | summary: m1 |
|
45 | summary: m1 | |
46 |
|
46 | |||
47 | comparing with c |
|
47 | comparing with c | |
48 | searching for changes |
|
48 | searching for changes | |
49 |
changeset: 3: |
|
49 | changeset: 3:cbb48b367d1b | |
50 | tag: tip |
|
50 | tag: tip | |
51 |
parent: 2: |
|
51 | parent: 2:8e1bb01c1a24 | |
52 |
parent: 1: |
|
52 | parent: 1:79f9e10cd04e | |
53 | user: test |
|
53 | user: test | |
54 |
date: |
|
54 | date: Thu Jan 01 00:00:00 1970 +0000 | |
55 | summary: m1 |
|
55 | summary: m1 | |
56 |
|
56 | |||
57 | comparing with b |
|
57 | comparing with b | |
58 | searching for changes |
|
58 | searching for changes | |
59 |
changeset: 3: |
|
59 | changeset: 3:119caaef4ed1 | |
60 | tag: tip |
|
60 | tag: tip | |
61 |
parent: 1: |
|
61 | parent: 1:79f9e10cd04e | |
62 |
parent: 2: |
|
62 | parent: 2:8e1bb01c1a24 | |
63 | user: test |
|
63 | user: test | |
64 |
date: |
|
64 | date: Thu Jan 01 00:00:00 1970 +0000 | |
65 | summary: m2 |
|
65 | summary: m2 | |
66 |
|
66 | |||
67 | pulling from a |
|
67 | pulling from a |
@@ -16,7 +16,7 b' EOF' | |||||
16 | echo "this is a test" | gzip > a.gz |
|
16 | echo "this is a test" | gzip > a.gz | |
17 | echo "this is a test" > not.gz |
|
17 | echo "this is a test" > not.gz | |
18 | hg add * |
|
18 | hg add * | |
19 |
hg ci -m "test" |
|
19 | hg ci -m "test" | |
20 | echo %% no changes |
|
20 | echo %% no changes | |
21 | hg status |
|
21 | hg status | |
22 | touch * |
|
22 | touch * |
@@ -16,17 +16,17 b' EOF' | |||||
16 | echo % should fail with encoding error |
|
16 | echo % should fail with encoding error | |
17 | echo "plain old ascii" > a |
|
17 | echo "plain old ascii" > a | |
18 | hg st |
|
18 | hg st | |
19 |
HGENCODING=ascii hg ci -l latin-1 |
|
19 | HGENCODING=ascii hg ci -l latin-1 | |
20 |
|
20 | |||
21 | echo % these should work |
|
21 | echo % these should work | |
22 | echo "latin-1" > a |
|
22 | echo "latin-1" > a | |
23 |
HGENCODING=latin-1 hg ci -l latin-1 |
|
23 | HGENCODING=latin-1 hg ci -l latin-1 | |
24 | echo "utf-8" > a |
|
24 | echo "utf-8" > a | |
25 |
HGENCODING=utf-8 hg ci -l utf-8 |
|
25 | HGENCODING=utf-8 hg ci -l utf-8 | |
26 |
|
26 | |||
27 |
HGENCODING=latin-1 hg tag |
|
27 | HGENCODING=latin-1 hg tag `cat latin-1-tag` | |
28 | HGENCODING=latin-1 hg branch `cat latin-1-tag` |
|
28 | HGENCODING=latin-1 hg branch `cat latin-1-tag` | |
29 |
HGENCODING=latin-1 hg ci - |
|
29 | HGENCODING=latin-1 hg ci -m 'latin1 branch' | |
30 | rm .hg/branch |
|
30 | rm .hg/branch | |
31 |
|
31 | |||
32 | echo "% hg log (ascii)" |
|
32 | echo "% hg log (ascii)" | |
@@ -58,5 +58,5 b' HGENCODING=dolphin hg log' | |||||
58 |
|
58 | |||
59 | HGENCODING=ascii hg branch `cat latin-1-tag` |
|
59 | HGENCODING=ascii hg branch `cat latin-1-tag` | |
60 | cp latin-1-tag .hg/branch |
|
60 | cp latin-1-tag .hg/branch | |
61 |
HGENCODING=latin-1 hg ci - |
|
61 | HGENCODING=latin-1 hg ci -m 'should fail' | |
62 | exit 0 |
|
62 | exit 0 |
@@ -78,21 +78,21 b' hg add $L' | |||||
78 | echo 'first line(1)' >> s; cp s $S |
|
78 | echo 'first line(1)' >> s; cp s $S | |
79 | echo 'first line(2)' >> m; cp m $M |
|
79 | echo 'first line(2)' >> m; cp m $M | |
80 | echo 'first line(3)' >> l; cp l $L |
|
80 | echo 'first line(3)' >> l; cp l $L | |
81 |
hg commit -m 'first commit' -u $S |
|
81 | hg commit -m 'first commit' -u $S | |
82 |
|
82 | |||
83 | #### commit(2) |
|
83 | #### commit(2) | |
84 |
|
84 | |||
85 | echo 'second line(1)' >> s; cp s $S |
|
85 | echo 'second line(1)' >> s; cp s $S | |
86 | echo 'second line(2)' >> m; cp m $M |
|
86 | echo 'second line(2)' >> m; cp m $M | |
87 | echo 'second line(3)' >> l; cp l $L |
|
87 | echo 'second line(3)' >> l; cp l $L | |
88 |
hg commit -m 'second commit' -u $M |
|
88 | hg commit -m 'second commit' -u $M | |
89 |
|
89 | |||
90 | #### commit(3) |
|
90 | #### commit(3) | |
91 |
|
91 | |||
92 | echo 'third line(1)' >> s; cp s $S |
|
92 | echo 'third line(1)' >> s; cp s $S | |
93 | echo 'third line(2)' >> m; cp m $M |
|
93 | echo 'third line(2)' >> m; cp m $M | |
94 | echo 'third line(3)' >> l; cp l $L |
|
94 | echo 'third line(3)' >> l; cp l $L | |
95 |
hg commit -m 'third commit' -u $L |
|
95 | hg commit -m 'third commit' -u $L | |
96 |
|
96 | |||
97 | #### check |
|
97 | #### check | |
98 |
|
98 | |||
@@ -109,11 +109,11 b' hg diff -c tip --stat' | |||||
109 | #### add branches/tags |
|
109 | #### add branches/tags | |
110 |
|
110 | |||
111 | hg branch $S |
|
111 | hg branch $S | |
112 | hg tag -d "1000000 0" $S |
|
112 | hg tag $S | |
113 | hg branch $M |
|
113 | hg branch $M | |
114 | hg tag -d "1000000 0" $M |
|
114 | hg tag $M | |
115 | hg branch $L |
|
115 | hg branch $L | |
116 | hg tag -d "1000000 0" $L |
|
116 | hg tag $L | |
117 |
|
117 | |||
118 | #### check |
|
118 | #### check | |
119 |
|
119 |
@@ -23,12 +23,12 b' marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d' | |||||
23 | marked working directory as branch MIDDLE_ |
|
23 | marked working directory as branch MIDDLE_ | |
24 | marked working directory as branch ι·γι·γεε |
|
24 | marked working directory as branch ι·γι·γεε | |
25 | % check alignment of branches |
|
25 | % check alignment of branches | |
26 |
tip 5: |
|
26 | tip 5:d745ff46155b | |
27 |
ι·γι·γεε 4: |
|
27 | ι·γι·γεε 4:9259be597f19 | |
28 |
MIDDLE_ 3: |
|
28 | MIDDLE_ 3:b06c5b6def9e | |
29 |
ηε 2: |
|
29 | ηε 2:64a70663cee8 | |
30 | % check alignment of tags |
|
30 | % check alignment of tags | |
31 |
tip 5: |
|
31 | tip 5:d745ff46155b | |
32 |
ι·γι·γεε 4: |
|
32 | ι·γι·γεε 4:9259be597f19 | |
33 |
MIDDLE_ 3: |
|
33 | MIDDLE_ 3:b06c5b6def9e | |
34 |
ηε 2: |
|
34 | ηε 2:64a70663cee8 |
@@ -15,27 +15,27 b" abort: decoding near ' encoded: \xe9': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)!" | |||||
15 | % these should work |
|
15 | % these should work | |
16 | marked working directory as branch οΏ½ |
|
16 | marked working directory as branch οΏ½ | |
17 | % hg log (ascii) |
|
17 | % hg log (ascii) | |
18 | changeset: 5:db5520b4645f |
|
18 | changeset: 5:093c6077d1c8 | |
19 | branch: ? |
|
19 | branch: ? | |
20 | tag: tip |
|
20 | tag: tip | |
21 | user: test |
|
21 | user: test | |
22 |
date: |
|
22 | date: Thu Jan 01 00:00:00 1970 +0000 | |
23 | summary: latin1 branch |
|
23 | summary: latin1 branch | |
24 |
|
24 | |||
25 |
changeset: 4:9 |
|
25 | changeset: 4:94db611b4196 | |
26 | user: test |
|
26 | user: test | |
27 |
date: |
|
27 | date: Thu Jan 01 00:00:00 1970 +0000 | |
28 |
summary: Added tag ? for changeset |
|
28 | summary: Added tag ? for changeset ca661e7520de | |
29 |
|
29 | |||
30 |
changeset: 3: |
|
30 | changeset: 3:ca661e7520de | |
31 | tag: ? |
|
31 | tag: ? | |
32 | user: test |
|
32 | user: test | |
33 |
date: |
|
33 | date: Thu Jan 01 00:00:00 1970 +0000 | |
34 | summary: utf-8 e' encoded: ? |
|
34 | summary: utf-8 e' encoded: ? | |
35 |
|
35 | |||
36 |
changeset: 2: |
|
36 | changeset: 2:650c6f3d55dd | |
37 | user: test |
|
37 | user: test | |
38 |
date: |
|
38 | date: Thu Jan 01 00:00:00 1970 +0000 | |
39 | summary: latin-1 e' encoded: ? |
|
39 | summary: latin-1 e' encoded: ? | |
40 |
|
40 | |||
41 | changeset: 1:0e5b7e3f9c4a |
|
41 | changeset: 1:0e5b7e3f9c4a | |
@@ -49,27 +49,27 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
49 | summary: latin-1 e': ? = u'\xe9' |
|
49 | summary: latin-1 e': ? = u'\xe9' | |
50 |
|
50 | |||
51 | % hg log (latin-1) |
|
51 | % hg log (latin-1) | |
52 | changeset: 5:db5520b4645f |
|
52 | changeset: 5:093c6077d1c8 | |
53 | branch: οΏ½ |
|
53 | branch: οΏ½ | |
54 | tag: tip |
|
54 | tag: tip | |
55 | user: test |
|
55 | user: test | |
56 |
date: |
|
56 | date: Thu Jan 01 00:00:00 1970 +0000 | |
57 | summary: latin1 branch |
|
57 | summary: latin1 branch | |
58 |
|
58 | |||
59 |
changeset: 4:9 |
|
59 | changeset: 4:94db611b4196 | |
60 | user: test |
|
60 | user: test | |
61 |
date: |
|
61 | date: Thu Jan 01 00:00:00 1970 +0000 | |
62 |
summary: Added tag οΏ½ for changeset |
|
62 | summary: Added tag οΏ½ for changeset ca661e7520de | |
63 |
|
63 | |||
64 |
changeset: 3: |
|
64 | changeset: 3:ca661e7520de | |
65 | tag: οΏ½ |
|
65 | tag: οΏ½ | |
66 | user: test |
|
66 | user: test | |
67 |
date: |
|
67 | date: Thu Jan 01 00:00:00 1970 +0000 | |
68 | summary: utf-8 e' encoded: οΏ½ |
|
68 | summary: utf-8 e' encoded: οΏ½ | |
69 |
|
69 | |||
70 |
changeset: 2: |
|
70 | changeset: 2:650c6f3d55dd | |
71 | user: test |
|
71 | user: test | |
72 |
date: |
|
72 | date: Thu Jan 01 00:00:00 1970 +0000 | |
73 | summary: latin-1 e' encoded: οΏ½ |
|
73 | summary: latin-1 e' encoded: οΏ½ | |
74 |
|
74 | |||
75 | changeset: 1:0e5b7e3f9c4a |
|
75 | changeset: 1:0e5b7e3f9c4a | |
@@ -83,27 +83,27 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
83 | summary: latin-1 e': οΏ½ = u'\xe9' |
|
83 | summary: latin-1 e': οΏ½ = u'\xe9' | |
84 |
|
84 | |||
85 | % hg log (utf-8) |
|
85 | % hg log (utf-8) | |
86 | changeset: 5:db5520b4645f |
|
86 | changeset: 5:093c6077d1c8 | |
87 | branch: Γ© |
|
87 | branch: Γ© | |
88 | tag: tip |
|
88 | tag: tip | |
89 | user: test |
|
89 | user: test | |
90 |
date: |
|
90 | date: Thu Jan 01 00:00:00 1970 +0000 | |
91 | summary: latin1 branch |
|
91 | summary: latin1 branch | |
92 |
|
92 | |||
93 |
changeset: 4:9 |
|
93 | changeset: 4:94db611b4196 | |
94 | user: test |
|
94 | user: test | |
95 |
date: |
|
95 | date: Thu Jan 01 00:00:00 1970 +0000 | |
96 |
summary: Added tag Γ© for changeset |
|
96 | summary: Added tag Γ© for changeset ca661e7520de | |
97 |
|
97 | |||
98 |
changeset: 3: |
|
98 | changeset: 3:ca661e7520de | |
99 | tag: Γ© |
|
99 | tag: Γ© | |
100 | user: test |
|
100 | user: test | |
101 |
date: |
|
101 | date: Thu Jan 01 00:00:00 1970 +0000 | |
102 | summary: utf-8 e' encoded: Γ© |
|
102 | summary: utf-8 e' encoded: Γ© | |
103 |
|
103 | |||
104 |
changeset: 2: |
|
104 | changeset: 2:650c6f3d55dd | |
105 | user: test |
|
105 | user: test | |
106 |
date: |
|
106 | date: Thu Jan 01 00:00:00 1970 +0000 | |
107 | summary: latin-1 e' encoded: Γ© |
|
107 | summary: latin-1 e' encoded: Γ© | |
108 |
|
108 | |||
109 | changeset: 1:0e5b7e3f9c4a |
|
109 | changeset: 1:0e5b7e3f9c4a | |
@@ -117,45 +117,45 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
117 | summary: latin-1 e': Γ© = u'\xe9' |
|
117 | summary: latin-1 e': Γ© = u'\xe9' | |
118 |
|
118 | |||
119 | % hg tags (ascii) |
|
119 | % hg tags (ascii) | |
120 |
tip 5: |
|
120 | tip 5:093c6077d1c8 | |
121 |
? 3: |
|
121 | ? 3:ca661e7520de | |
122 | % hg tags (latin-1) |
|
122 | % hg tags (latin-1) | |
123 |
tip 5: |
|
123 | tip 5:093c6077d1c8 | |
124 |
οΏ½ 3: |
|
124 | οΏ½ 3:ca661e7520de | |
125 | % hg tags (utf-8) |
|
125 | % hg tags (utf-8) | |
126 |
tip 5: |
|
126 | tip 5:093c6077d1c8 | |
127 |
Γ© 3: |
|
127 | Γ© 3:ca661e7520de | |
128 | % hg branches (ascii) |
|
128 | % hg branches (ascii) | |
129 |
? 5: |
|
129 | ? 5:093c6077d1c8 | |
130 |
default 4:9 |
|
130 | default 4:94db611b4196 (inactive) | |
131 | % hg branches (latin-1) |
|
131 | % hg branches (latin-1) | |
132 |
οΏ½ 5: |
|
132 | οΏ½ 5:093c6077d1c8 | |
133 |
default 4:9 |
|
133 | default 4:94db611b4196 (inactive) | |
134 | % hg branches (utf-8) |
|
134 | % hg branches (utf-8) | |
135 |
Γ© 5: |
|
135 | Γ© 5:093c6077d1c8 | |
136 |
default 4:9 |
|
136 | default 4:94db611b4196 (inactive) | |
137 | % hg log (utf-8) |
|
137 | % hg log (utf-8) | |
138 | changeset: 5:db5520b4645f |
|
138 | changeset: 5:093c6077d1c8 | |
139 | branch: Γ© |
|
139 | branch: Γ© | |
140 | tag: tip |
|
140 | tag: tip | |
141 | user: test |
|
141 | user: test | |
142 |
date: |
|
142 | date: Thu Jan 01 00:00:00 1970 +0000 | |
143 | summary: latin1 branch |
|
143 | summary: latin1 branch | |
144 |
|
144 | |||
145 |
changeset: 4:9 |
|
145 | changeset: 4:94db611b4196 | |
146 | user: test |
|
146 | user: test | |
147 |
date: |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
148 |
summary: Added tag Γ© for changeset |
|
148 | summary: Added tag Γ© for changeset ca661e7520de | |
149 |
|
149 | |||
150 |
changeset: 3: |
|
150 | changeset: 3:ca661e7520de | |
151 | tag: Γ© |
|
151 | tag: Γ© | |
152 | user: test |
|
152 | user: test | |
153 |
date: |
|
153 | date: Thu Jan 01 00:00:00 1970 +0000 | |
154 | summary: utf-8 e' encoded: Γ© |
|
154 | summary: utf-8 e' encoded: Γ© | |
155 |
|
155 | |||
156 |
changeset: 2: |
|
156 | changeset: 2:650c6f3d55dd | |
157 | user: test |
|
157 | user: test | |
158 |
date: |
|
158 | date: Thu Jan 01 00:00:00 1970 +0000 | |
159 | summary: latin-1 e' encoded: Γ© |
|
159 | summary: latin-1 e' encoded: Γ© | |
160 |
|
160 | |||
161 | changeset: 1:0e5b7e3f9c4a |
|
161 | changeset: 1:0e5b7e3f9c4a |
@@ -4,72 +4,72 b'' | |||||
4 | $ echo foo > b |
|
4 | $ echo foo > b | |
5 | $ hg add a b |
|
5 | $ hg add a b | |
6 |
|
6 | |||
7 |
$ hg ci -m "test" |
|
7 | $ hg ci -m "test" | |
8 |
|
8 | |||
9 | $ echo blah > a |
|
9 | $ echo blah > a | |
10 |
|
10 | |||
11 |
$ hg ci -m "branch a" |
|
11 | $ hg ci -m "branch a" | |
12 |
|
12 | |||
13 | $ hg co 0 |
|
13 | $ hg co 0 | |
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 |
|
15 | |||
16 | $ echo blah > b |
|
16 | $ echo blah > b | |
17 |
|
17 | |||
18 |
$ hg ci -m "branch b" |
|
18 | $ hg ci -m "branch b" | |
19 | created new head |
|
19 | created new head | |
20 | $ HGMERGE=true hg merge 1 |
|
20 | $ HGMERGE=true hg merge 1 | |
21 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 | (branch merge, don't forget to commit) |
|
22 | (branch merge, don't forget to commit) | |
23 |
|
23 | |||
24 |
$ hg ci -m "merge b/a -> blah" |
|
24 | $ hg ci -m "merge b/a -> blah" | |
25 |
|
25 | |||
26 | $ hg co 1 |
|
26 | $ hg co 1 | |
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | $ HGMERGE=true hg merge 2 |
|
28 | $ HGMERGE=true hg merge 2 | |
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 | (branch merge, don't forget to commit) |
|
30 | (branch merge, don't forget to commit) | |
31 |
$ hg ci -m "merge a/b -> blah" |
|
31 | $ hg ci -m "merge a/b -> blah" | |
32 | created new head |
|
32 | created new head | |
33 |
|
33 | |||
34 | $ hg log |
|
34 | $ hg log | |
35 |
changeset: 4: |
|
35 | changeset: 4:2ee31f665a86 | |
36 | tag: tip |
|
36 | tag: tip | |
37 |
parent: 1: |
|
37 | parent: 1:96155394af80 | |
38 |
parent: 2: |
|
38 | parent: 2:92cc4c306b19 | |
39 | user: test |
|
39 | user: test | |
40 |
date: |
|
40 | date: Thu Jan 01 00:00:00 1970 +0000 | |
41 | summary: merge a/b -> blah |
|
41 | summary: merge a/b -> blah | |
42 |
|
42 | |||
43 |
changeset: 3: |
|
43 | changeset: 3:e16a66a37edd | |
44 |
parent: 2: |
|
44 | parent: 2:92cc4c306b19 | |
45 |
parent: 1: |
|
45 | parent: 1:96155394af80 | |
46 | user: test |
|
46 | user: test | |
47 |
date: |
|
47 | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 | summary: merge b/a -> blah |
|
48 | summary: merge b/a -> blah | |
49 |
|
49 | |||
50 |
changeset: 2: |
|
50 | changeset: 2:92cc4c306b19 | |
51 |
parent: 0: |
|
51 | parent: 0:5e0375449e74 | |
52 | user: test |
|
52 | user: test | |
53 |
date: |
|
53 | date: Thu Jan 01 00:00:00 1970 +0000 | |
54 | summary: branch b |
|
54 | summary: branch b | |
55 |
|
55 | |||
56 |
changeset: 1: |
|
56 | changeset: 1:96155394af80 | |
57 | user: test |
|
57 | user: test | |
58 |
date: |
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 | |
59 | summary: branch a |
|
59 | summary: branch a | |
60 |
|
60 | |||
61 |
changeset: 0: |
|
61 | changeset: 0:5e0375449e74 | |
62 | user: test |
|
62 | user: test | |
63 |
date: |
|
63 | date: Thu Jan 01 00:00:00 1970 +0000 | |
64 | summary: test |
|
64 | summary: test | |
65 |
|
65 | |||
66 | $ hg debugindex .hg/store/00changelog.i |
|
66 | $ hg debugindex .hg/store/00changelog.i | |
67 | rev offset length base linkrev nodeid p1 p2 |
|
67 | rev offset length base linkrev nodeid p1 p2 | |
68 |
0 0 6 |
|
68 | 0 0 60 0 0 5e0375449e74 000000000000 000000000000 | |
69 |
1 6 |
|
69 | 1 60 62 1 1 96155394af80 5e0375449e74 000000000000 | |
70 |
2 1 |
|
70 | 2 122 62 2 2 92cc4c306b19 5e0375449e74 000000000000 | |
71 | 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 |
|
71 | 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 | |
72 |
4 2 |
|
72 | 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 | |
73 |
|
73 | |||
74 | revision 1 |
|
74 | revision 1 | |
75 | $ hg manifest --debug 1 |
|
75 | $ hg manifest --debug 1 |
@@ -17,7 +17,7 b' echo 1 > bar' | |||||
17 | echo 1 > baz |
|
17 | echo 1 > baz | |
18 | echo 1 > quux |
|
18 | echo 1 > quux | |
19 | hg add foo bar baz quux |
|
19 | hg add foo bar baz quux | |
20 |
hg commit -m "base" |
|
20 | hg commit -m "base" | |
21 |
|
21 | |||
22 | cd .. |
|
22 | cd .. | |
23 | hg clone a b |
|
23 | hg clone a b | |
@@ -26,7 +26,7 b' echo creating branch a' | |||||
26 | cd a |
|
26 | cd a | |
27 | echo 2a > foo |
|
27 | echo 2a > foo | |
28 | echo 2a > bar |
|
28 | echo 2a > bar | |
29 |
hg commit -m "branch a" |
|
29 | hg commit -m "branch a" | |
30 |
|
30 | |||
31 | echo creating branch b |
|
31 | echo creating branch b | |
32 |
|
32 | |||
@@ -34,7 +34,7 b' cd ..' | |||||
34 | cd b |
|
34 | cd b | |
35 | echo 2b > foo |
|
35 | echo 2b > foo | |
36 | echo 2b > baz |
|
36 | echo 2b > baz | |
37 |
hg commit -m "branch b" |
|
37 | hg commit -m "branch b" | |
38 |
|
38 | |||
39 | echo "we shouldn't have anything but n state here" |
|
39 | echo "we shouldn't have anything but n state here" | |
40 | hg debugstate --nodates | grep -v "^n" |
|
40 | hg debugstate --nodates | grep -v "^n" | |
@@ -50,7 +50,7 b' echo new > quux' | |||||
50 | echo "we shouldn't have anything but foo in merge state here" |
|
50 | echo "we shouldn't have anything but foo in merge state here" | |
51 | hg debugstate --nodates | grep "^m" |
|
51 | hg debugstate --nodates | grep "^m" | |
52 |
|
52 | |||
53 |
hg ci -m "merge" |
|
53 | hg ci -m "merge" | |
54 |
|
54 | |||
55 | echo "main: we should have a merge here" |
|
55 | echo "main: we should have a merge here" | |
56 | hg debugindex .hg/store/00changelog.i |
|
56 | hg debugindex .hg/store/00changelog.i |
@@ -22,17 +22,17 b" we shouldn't have anything but foo in me" | |||||
22 | m 644 3 foo |
|
22 | m 644 3 foo | |
23 | main: we should have a merge here |
|
23 | main: we should have a merge here | |
24 | rev offset length base linkrev nodeid p1 p2 |
|
24 | rev offset length base linkrev nodeid p1 p2 | |
25 |
0 0 7 |
|
25 | 0 0 73 0 0 cdca01651b96 000000000000 000000000000 | |
26 |
1 7 |
|
26 | 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 | |
27 |
2 1 |
|
27 | 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 | |
28 | 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 |
|
28 | 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 | |
29 | log should show foo and quux changed |
|
29 | log should show foo and quux changed | |
30 | changeset: 3:0c2cc6fc80e2 |
|
30 | changeset: 3:d8a521142a3c | |
31 | tag: tip |
|
31 | tag: tip | |
32 |
parent: 1: |
|
32 | parent: 1:f6718a9cb7f3 | |
33 |
parent: 2: |
|
33 | parent: 2:bdd988058d16 | |
34 | user: test |
|
34 | user: test | |
35 |
date: |
|
35 | date: Thu Jan 01 00:00:00 1970 +0000 | |
36 | files: foo quux |
|
36 | files: foo quux | |
37 | description: |
|
37 | description: | |
38 | merge |
|
38 | merge |
@@ -5,7 +5,7 b'' | |||||
5 | $ hg init |
|
5 | $ hg init | |
6 | $ touch a b |
|
6 | $ touch a b | |
7 | $ hg add a b |
|
7 | $ hg add a b | |
8 |
$ hg ci -m "added a b" |
|
8 | $ hg ci -m "added a b" | |
9 |
|
9 | |||
10 | $ cd .. |
|
10 | $ cd .. | |
11 | $ hg clone test1 test3 |
|
11 | $ hg clone test1 test3 | |
@@ -26,7 +26,7 b'' | |||||
26 | $ hg co |
|
26 | $ hg co | |
27 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | $ chmod +x a |
|
28 | $ chmod +x a | |
29 |
$ hg ci -m "chmod +x a" |
|
29 | $ hg ci -m "chmod +x a" | |
30 |
|
30 | |||
31 | the changelog should mention file a: |
|
31 | the changelog should mention file a: | |
32 |
|
32 | |||
@@ -35,7 +35,7 b' the changelog should mention file a:' | |||||
35 |
|
35 | |||
36 | $ cd ../test1 |
|
36 | $ cd ../test1 | |
37 | $ echo 123 >>a |
|
37 | $ echo 123 >>a | |
38 |
$ hg ci -m "a updated" |
|
38 | $ hg ci -m "a updated" | |
39 |
|
39 | |||
40 | $ hg pull ../test2 |
|
40 | $ hg pull ../test2 | |
41 | pulling from ../test2 |
|
41 | pulling from ../test2 | |
@@ -46,34 +46,34 b' the changelog should mention file a:' | |||||
46 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
46 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
47 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
47 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
48 | $ hg heads |
|
48 | $ hg heads | |
49 |
changeset: 2: |
|
49 | changeset: 2:7f4313b42a34 | |
50 | tag: tip |
|
50 | tag: tip | |
51 |
parent: 0: |
|
51 | parent: 0:22a449e20da5 | |
52 | user: test |
|
52 | user: test | |
53 |
date: |
|
53 | date: Thu Jan 01 00:00:00 1970 +0000 | |
54 | summary: chmod +x a |
|
54 | summary: chmod +x a | |
55 |
|
55 | |||
56 |
changeset: 1: |
|
56 | changeset: 1:c6ecefc45368 | |
57 | user: test |
|
57 | user: test | |
58 |
date: |
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 | |
59 | summary: a updated |
|
59 | summary: a updated | |
60 |
|
60 | |||
61 | $ hg history |
|
61 | $ hg history | |
62 |
changeset: 2: |
|
62 | changeset: 2:7f4313b42a34 | |
63 | tag: tip |
|
63 | tag: tip | |
64 |
parent: 0: |
|
64 | parent: 0:22a449e20da5 | |
65 | user: test |
|
65 | user: test | |
66 |
date: |
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | summary: chmod +x a |
|
67 | summary: chmod +x a | |
68 |
|
68 | |||
69 |
changeset: 1: |
|
69 | changeset: 1:c6ecefc45368 | |
70 | user: test |
|
70 | user: test | |
71 |
date: |
|
71 | date: Thu Jan 01 00:00:00 1970 +0000 | |
72 | summary: a updated |
|
72 | summary: a updated | |
73 |
|
73 | |||
74 |
changeset: 0: |
|
74 | changeset: 0:22a449e20da5 | |
75 | user: test |
|
75 | user: test | |
76 |
date: |
|
76 | date: Thu Jan 01 00:00:00 1970 +0000 | |
77 | summary: added a b |
|
77 | summary: added a b | |
78 |
|
78 | |||
79 |
|
79 | |||
@@ -84,7 +84,7 b' the changelog should mention file a:' | |||||
84 |
|
84 | |||
85 | $ cd ../test3 |
|
85 | $ cd ../test3 | |
86 | $ echo 123 >>b |
|
86 | $ echo 123 >>b | |
87 |
$ hg ci -m "b updated" |
|
87 | $ hg ci -m "b updated" | |
88 |
|
88 | |||
89 | $ hg pull ../test2 |
|
89 | $ hg pull ../test2 | |
90 | pulling from ../test2 |
|
90 | pulling from ../test2 | |
@@ -95,34 +95,34 b' the changelog should mention file a:' | |||||
95 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
95 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
96 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
96 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
97 | $ hg heads |
|
97 | $ hg heads | |
98 |
changeset: 2: |
|
98 | changeset: 2:7f4313b42a34 | |
99 | tag: tip |
|
99 | tag: tip | |
100 |
parent: 0: |
|
100 | parent: 0:22a449e20da5 | |
101 | user: test |
|
101 | user: test | |
102 |
date: |
|
102 | date: Thu Jan 01 00:00:00 1970 +0000 | |
103 | summary: chmod +x a |
|
103 | summary: chmod +x a | |
104 |
|
104 | |||
105 |
changeset: 1:d |
|
105 | changeset: 1:dc57ead75f79 | |
106 | user: test |
|
106 | user: test | |
107 |
date: |
|
107 | date: Thu Jan 01 00:00:00 1970 +0000 | |
108 | summary: b updated |
|
108 | summary: b updated | |
109 |
|
109 | |||
110 | $ hg history |
|
110 | $ hg history | |
111 |
changeset: 2: |
|
111 | changeset: 2:7f4313b42a34 | |
112 | tag: tip |
|
112 | tag: tip | |
113 |
parent: 0: |
|
113 | parent: 0:22a449e20da5 | |
114 | user: test |
|
114 | user: test | |
115 |
date: |
|
115 | date: Thu Jan 01 00:00:00 1970 +0000 | |
116 | summary: chmod +x a |
|
116 | summary: chmod +x a | |
117 |
|
117 | |||
118 |
changeset: 1:d |
|
118 | changeset: 1:dc57ead75f79 | |
119 | user: test |
|
119 | user: test | |
120 |
date: |
|
120 | date: Thu Jan 01 00:00:00 1970 +0000 | |
121 | summary: b updated |
|
121 | summary: b updated | |
122 |
|
122 | |||
123 |
changeset: 0: |
|
123 | changeset: 0:22a449e20da5 | |
124 | user: test |
|
124 | user: test | |
125 |
date: |
|
125 | date: Thu Jan 01 00:00:00 1970 +0000 | |
126 | summary: added a b |
|
126 | summary: added a b | |
127 |
|
127 | |||
128 |
|
128 |
@@ -15,12 +15,12 b'' | |||||
15 | $ echo 'post-cat = python ../printenv.py post-cat' >> .hg/hgrc |
|
15 | $ echo 'post-cat = python ../printenv.py post-cat' >> .hg/hgrc | |
16 | $ echo a > a |
|
16 | $ echo a > a | |
17 | $ hg add a |
|
17 | $ hg add a | |
18 |
$ hg commit -m a |
|
18 | $ hg commit -m a | |
19 | precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 |
|
19 | precommit hook: HG_PARENT1=0000000000000000000000000000000000000000 | |
20 |
pretxncommit hook: HG_NODE= |
|
20 | pretxncommit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 HG_PENDING=$HGTMP/test-hook.t/a | |
21 | 0:29b62aeb769f |
|
21 | 0:cb9a9f314b8b | |
22 |
commit hook: HG_NODE= |
|
22 | commit hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 | |
23 |
commit.b hook: HG_NODE= |
|
23 | commit.b hook: HG_NODE=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PARENT1=0000000000000000000000000000000000000000 | |
24 |
|
24 | |||
25 | $ hg clone . ../b |
|
25 | $ hg clone . ../b | |
26 | updating to branch default |
|
26 | updating to branch default | |
@@ -39,31 +39,31 b'' | |||||
39 | $ cd ../a |
|
39 | $ cd ../a | |
40 | $ echo b >> a |
|
40 | $ echo b >> a | |
41 | $ hg commit -m a1 -d "1 0" |
|
41 | $ hg commit -m a1 -d "1 0" | |
42 |
precommit hook: HG_PARENT1= |
|
42 | precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
43 |
pretxncommit hook: HG_NODE= |
|
43 | pretxncommit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a | |
44 | 1:b702efe96888 |
|
44 | 1:ab228980c14d | |
45 | commit hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
45 | commit hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
46 | commit.b hook: HG_NODE=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
46 | commit.b hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
47 | $ hg update -C 0 |
|
47 | $ hg update -C 0 | |
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
49 | $ echo b > b |
|
49 | $ echo b > b | |
50 | $ hg add b |
|
50 | $ hg add b | |
51 | $ hg commit -m b -d '1 0' |
|
51 | $ hg commit -m b -d '1 0' | |
52 |
precommit hook: HG_PARENT1= |
|
52 | precommit hook: HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
53 |
pretxncommit hook: HG_NODE= |
|
53 | pretxncommit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b HG_PENDING=$HGTMP/test-hook.t/a | |
54 | 2:1324a5531bac |
|
54 | 2:ee9deb46ab31 | |
55 | commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
55 | commit hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
56 | commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
56 | commit.b hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b | |
57 | created new head |
|
57 | created new head | |
58 |
$ |
|
58 | $ hg merge 1 | |
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 | (branch merge, don't forget to commit) |
|
60 | (branch merge, don't forget to commit) | |
61 | $ hg commit -m merge -d '2 0' |
|
61 | $ hg commit -m merge -d '2 0' | |
62 | precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 |
|
62 | precommit hook: HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd | |
63 | pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 HG_PENDING=$HGTMP/test-hook.t/a |
|
63 | pretxncommit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd HG_PENDING=$HGTMP/test-hook.t/a | |
64 | 3:4c52fb2e4022 |
|
64 | 3:07f3376c1e65 | |
65 | commit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 |
|
65 | commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd | |
66 | commit.b hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 |
|
66 | commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd | |
67 |
|
67 | |||
68 | # test generic hooks |
|
68 | # test generic hooks | |
69 |
|
69 | |||
@@ -78,10 +78,10 b'' | |||||
78 | $ cd ../b |
|
78 | $ cd ../b | |
79 | $ hg pull ../a |
|
79 | $ hg pull ../a | |
80 | prechangegroup hook: HG_SOURCE=pull HG_URL=file: |
|
80 | prechangegroup hook: HG_SOURCE=pull HG_URL=file: | |
81 |
changegroup hook: HG_NODE= |
|
81 | changegroup hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: | |
82 |
incoming hook: HG_NODE= |
|
82 | incoming hook: HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_URL=file: | |
83 |
incoming hook: HG_NODE= |
|
83 | incoming hook: HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_URL=file: | |
84 |
incoming hook: HG_NODE= |
|
84 | incoming hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_URL=file: | |
85 | pulling from ../a |
|
85 | pulling from ../a | |
86 | searching for changes |
|
86 | searching for changes | |
87 | adding changesets |
|
87 | adding changesets | |
@@ -96,27 +96,27 b'' | |||||
96 | $ echo 'pretag = python ../printenv.py pretag' >> .hg/hgrc |
|
96 | $ echo 'pretag = python ../printenv.py pretag' >> .hg/hgrc | |
97 |
$ echo 'tag = unset HG_PARENT1 HG_PARENT2; |
|
97 | $ echo 'tag = unset HG_PARENT1 HG_PARENT2; python ../printenv.py tag' >> .hg/hgrc | |
98 | $ hg tag -d '3 0' a |
|
98 | $ hg tag -d '3 0' a | |
99 | pretag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a |
|
99 | pretag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a | |
100 | precommit hook: HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 |
|
100 | precommit hook: HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 | |
101 | pretxncommit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 HG_PENDING=$HGTMP/test-hook.t/a |
|
101 | pretxncommit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PENDING=$HGTMP/test-hook.t/a | |
102 | 4:8ea2ef7ad3e8 |
|
102 | 4:539e4b31b6dc | |
103 | commit hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 |
|
103 | commit hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 | |
104 | commit.b hook: HG_NODE=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 HG_PARENT1=4c52fb2e402287dd5dc052090682536c8406c321 |
|
104 | commit.b hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PARENT1=07f3376c1e655977439df2a814e3cc14b27abac2 | |
105 | tag hook: HG_LOCAL=0 HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321 HG_TAG=a |
|
105 | tag hook: HG_LOCAL=0 HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_TAG=a | |
106 | $ hg tag -l la |
|
106 | $ hg tag -l la | |
107 |
pretag hook: HG_LOCAL=1 HG_NODE= |
|
107 | pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la | |
108 |
tag hook: HG_LOCAL=1 HG_NODE= |
|
108 | tag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la | |
109 |
|
109 | |||
110 | # pretag hook can forbid tagging |
|
110 | # pretag hook can forbid tagging | |
111 |
|
111 | |||
112 | $ echo 'pretag.forbid = python ../printenv.py pretag.forbid 1' >> .hg/hgrc |
|
112 | $ echo 'pretag.forbid = python ../printenv.py pretag.forbid 1' >> .hg/hgrc | |
113 | $ hg tag -d '4 0' fa |
|
113 | $ hg tag -d '4 0' fa | |
114 |
pretag hook: HG_LOCAL=0 HG_NODE= |
|
114 | pretag hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa | |
115 |
pretag.forbid hook: HG_LOCAL=0 HG_NODE= |
|
115 | pretag.forbid hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa | |
116 | abort: pretag.forbid hook exited with status 1 |
|
116 | abort: pretag.forbid hook exited with status 1 | |
117 | $ hg tag -l fla |
|
117 | $ hg tag -l fla | |
118 |
pretag hook: HG_LOCAL=1 HG_NODE= |
|
118 | pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla | |
119 |
pretag.forbid hook: HG_LOCAL=1 HG_NODE= |
|
119 | pretag.forbid hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla | |
120 | abort: pretag.forbid hook exited with status 1 |
|
120 | abort: pretag.forbid hook exited with status 1 | |
121 |
|
121 | |||
122 | # pretxncommit hook can see changeset, can roll back txn, changeset |
|
122 | # pretxncommit hook can see changeset, can roll back txn, changeset | |
@@ -127,49 +127,49 b'' | |||||
127 | $ echo z > z |
|
127 | $ echo z > z | |
128 | $ hg add z |
|
128 | $ hg add z | |
129 | $ hg -q tip |
|
129 | $ hg -q tip | |
130 | 4:8ea2ef7ad3e8 |
|
130 | 4:539e4b31b6dc | |
131 | $ hg commit -m 'fail' -d '4 0' |
|
131 | $ hg commit -m 'fail' -d '4 0' | |
132 | precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 |
|
132 | precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 | |
133 |
pretxncommit hook: HG_NODE= |
|
133 | pretxncommit hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a | |
134 | 5:fad284daf8c0 |
|
134 | 5:6f611f8018c1 | |
135 | 5:fad284daf8c0 |
|
135 | 5:6f611f8018c1 | |
136 |
pretxncommit.forbid hook: HG_NODE= |
|
136 | pretxncommit.forbid hook: HG_NODE=6f611f8018c10e827fee6bd2bc807f937e761567 HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/a | |
137 | transaction abort! |
|
137 | transaction abort! | |
138 | rollback completed |
|
138 | rollback completed | |
139 | abort: pretxncommit.forbid1 hook exited with status 1 |
|
139 | abort: pretxncommit.forbid1 hook exited with status 1 | |
140 | $ hg -q tip |
|
140 | $ hg -q tip | |
141 | 4:8ea2ef7ad3e8 |
|
141 | 4:539e4b31b6dc | |
142 |
|
142 | |||
143 | # precommit hook can prevent commit |
|
143 | # precommit hook can prevent commit | |
144 |
|
144 | |||
145 | $ echo 'precommit.forbid = python ../printenv.py precommit.forbid 1' >> .hg/hgrc |
|
145 | $ echo 'precommit.forbid = python ../printenv.py precommit.forbid 1' >> .hg/hgrc | |
146 | $ hg commit -m 'fail' -d '4 0' |
|
146 | $ hg commit -m 'fail' -d '4 0' | |
147 | precommit hook: HG_PARENT1=8ea2ef7ad3e8cac946c72f1e0c79d6aebc301198 |
|
147 | precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 | |
148 |
precommit.forbid hook: HG_PARENT1= |
|
148 | precommit.forbid hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 | |
149 | abort: precommit.forbid hook exited with status 1 |
|
149 | abort: precommit.forbid hook exited with status 1 | |
150 | $ hg -q tip |
|
150 | $ hg -q tip | |
151 | 4:8ea2ef7ad3e8 |
|
151 | 4:539e4b31b6dc | |
152 |
|
152 | |||
153 | # preupdate hook can prevent update |
|
153 | # preupdate hook can prevent update | |
154 |
|
154 | |||
155 | $ echo 'preupdate = python ../printenv.py preupdate' >> .hg/hgrc |
|
155 | $ echo 'preupdate = python ../printenv.py preupdate' >> .hg/hgrc | |
156 | $ hg update 1 |
|
156 | $ hg update 1 | |
157 |
preupdate hook: HG_PARENT1= |
|
157 | preupdate hook: HG_PARENT1=ab228980c14d | |
158 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
158 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
159 |
|
159 | |||
160 | # update hook |
|
160 | # update hook | |
161 |
|
161 | |||
162 | $ echo 'update = python ../printenv.py update' >> .hg/hgrc |
|
162 | $ echo 'update = python ../printenv.py update' >> .hg/hgrc | |
163 | $ hg update |
|
163 | $ hg update | |
164 |
preupdate hook: HG_PARENT1= |
|
164 | preupdate hook: HG_PARENT1=539e4b31b6dc | |
165 |
update hook: HG_ERROR=0 HG_PARENT1= |
|
165 | update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc | |
166 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
166 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
167 |
|
167 | |||
168 | # prechangegroup hook can prevent incoming changes |
|
168 | # prechangegroup hook can prevent incoming changes | |
169 |
|
169 | |||
170 | $ cd ../b |
|
170 | $ cd ../b | |
171 | $ hg -q tip |
|
171 | $ hg -q tip | |
172 | 3:4c52fb2e4022 |
|
172 | 3:07f3376c1e65 | |
173 | $ echo '[hooks]' > .hg/hgrc |
|
173 | $ echo '[hooks]' > .hg/hgrc | |
174 | $ echo 'prechangegroup.forbid = python ../printenv.py prechangegroup.forbid 1' >> .hg/hgrc |
|
174 | $ echo 'prechangegroup.forbid = python ../printenv.py prechangegroup.forbid 1' >> .hg/hgrc | |
175 | $ hg pull ../a |
|
175 | $ hg pull ../a | |
@@ -185,8 +185,8 b'' | |||||
185 | $ echo 'pretxnchangegroup.forbid0 = hg tip -q' >> .hg/hgrc |
|
185 | $ echo 'pretxnchangegroup.forbid0 = hg tip -q' >> .hg/hgrc | |
186 | $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc |
|
186 | $ echo 'pretxnchangegroup.forbid1 = python ../printenv.py pretxnchangegroup.forbid 1' >> .hg/hgrc | |
187 | $ hg pull ../a |
|
187 | $ hg pull ../a | |
188 | 4:8ea2ef7ad3e8 |
|
188 | 4:539e4b31b6dc | |
189 |
pretxnchangegroup.forbid hook: HG_NODE= |
|
189 | pretxnchangegroup.forbid hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_PENDING=$HGTMP/test-hook.t/b HG_SOURCE=pull HG_URL=file: | |
190 | pulling from ../a |
|
190 | pulling from ../a | |
191 | searching for changes |
|
191 | searching for changes | |
192 | adding changesets |
|
192 | adding changesets | |
@@ -197,7 +197,7 b'' | |||||
197 | rollback completed |
|
197 | rollback completed | |
198 | abort: pretxnchangegroup.forbid1 hook exited with status 1 |
|
198 | abort: pretxnchangegroup.forbid1 hook exited with status 1 | |
199 | $ hg -q tip |
|
199 | $ hg -q tip | |
200 | 3:4c52fb2e4022 |
|
200 | 3:07f3376c1e65 | |
201 |
|
201 | |||
202 | # outgoing hooks can see env vars |
|
202 | # outgoing hooks can see env vars | |
203 |
|
203 | |||
@@ -207,7 +207,7 b'' | |||||
207 | $ echo 'outgoing = python ../printenv.py outgoing' >> ../a/.hg/hgrc |
|
207 | $ echo 'outgoing = python ../printenv.py outgoing' >> ../a/.hg/hgrc | |
208 | $ hg pull ../a |
|
208 | $ hg pull ../a | |
209 | preoutgoing hook: HG_SOURCE=pull |
|
209 | preoutgoing hook: HG_SOURCE=pull | |
210 |
outgoing hook: HG_NODE= |
|
210 | outgoing hook: HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_SOURCE=pull | |
211 | pulling from ../a |
|
211 | pulling from ../a | |
212 | searching for changes |
|
212 | searching for changes | |
213 | adding changesets |
|
213 | adding changesets | |
@@ -441,7 +441,7 b'' | |||||
441 | $ echo 'precommit.importfail = python:importfail.whatever' >> .hg/hgrc |
|
441 | $ echo 'precommit.importfail = python:importfail.whatever' >> .hg/hgrc | |
442 |
|
442 | |||
443 | $ echo a >> a |
|
443 | $ echo a >> a | |
444 |
$ hg --traceback commit - |
|
444 | $ hg --traceback commit -ma 2>&1 | egrep '^(exception|Traceback|ImportError)' | |
445 | exception from first failed import attempt: |
|
445 | exception from first failed import attempt: | |
446 | Traceback (most recent call last): |
|
446 | Traceback (most recent call last): | |
447 | ImportError: No module named somebogusmodule |
|
447 | ImportError: No module named somebogusmodule | |
@@ -456,10 +456,10 b'' | |||||
456 | $ echo 'commit = hg id' >> .hg/hgrc |
|
456 | $ echo 'commit = hg id' >> .hg/hgrc | |
457 | $ echo 'update = hg id' >> .hg/hgrc |
|
457 | $ echo 'update = hg id' >> .hg/hgrc | |
458 | $ echo bb > a |
|
458 | $ echo bb > a | |
459 |
$ hg ci - |
|
459 | $ hg ci -ma | |
460 | 8da618c33484 tip |
|
460 | 223eafe2750c tip | |
461 | $ hg up 0 |
|
461 | $ hg up 0 | |
462 | 29b62aeb769f |
|
462 | cb9a9f314b8b | |
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
463 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
464 |
|
464 | |||
465 | $ exit 0 |
|
465 | $ exit 0 |
@@ -3,7 +3,7 b'' | |||||
3 | $ hg init |
|
3 | $ hg init | |
4 | $ for i in 0 1 2 3 4 5 6 7 8; do |
|
4 | $ for i in 0 1 2 3 4 5 6 7 8; do | |
5 | > echo $i >> foo |
|
5 | > echo $i >> foo | |
6 |
> hg commit -A -m $i |
|
6 | > hg commit -A -m $i | |
7 | > done |
|
7 | > done | |
8 | adding foo |
|
8 | adding foo | |
9 | $ hg verify |
|
9 | $ hg verify | |
@@ -22,78 +22,78 b' http incoming' | |||||
22 |
|
22 | |||
23 | $ hg -R new incoming http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
23 | $ hg -R new incoming http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
24 | comparing with http://localhost:$HGPORT/ |
|
24 | comparing with http://localhost:$HGPORT/ | |
25 |
changeset: 0: |
|
25 | changeset: 0:00a43fa82f62 | |
26 | user: test |
|
26 | user: test | |
27 |
date: |
|
27 | date: Thu Jan 01 00:00:00 1970 +0000 | |
28 | summary: 0 |
|
28 | summary: 0 | |
29 |
|
29 | |||
30 |
changeset: 1: |
|
30 | changeset: 1:5460a410df01 | |
31 | user: test |
|
31 | user: test | |
32 |
date: |
|
32 | date: Thu Jan 01 00:00:00 1970 +0000 | |
33 | summary: 1 |
|
33 | summary: 1 | |
34 |
|
34 | |||
35 |
changeset: 2: |
|
35 | changeset: 2:d9f42cd1a1ec | |
36 | user: test |
|
36 | user: test | |
37 |
date: |
|
37 | date: Thu Jan 01 00:00:00 1970 +0000 | |
38 | summary: 2 |
|
38 | summary: 2 | |
39 |
|
39 | |||
40 |
changeset: 3: |
|
40 | changeset: 3:376476025137 | |
41 | user: test |
|
41 | user: test | |
42 |
date: |
|
42 | date: Thu Jan 01 00:00:00 1970 +0000 | |
43 | summary: 3 |
|
43 | summary: 3 | |
44 |
|
44 | |||
45 |
changeset: 4: |
|
45 | changeset: 4:70d7eb252d49 | |
46 | user: test |
|
46 | user: test | |
47 |
date: |
|
47 | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 | summary: 4 |
|
48 | summary: 4 | |
49 |
|
49 | |||
50 |
changeset: 5: |
|
50 | changeset: 5:ad284ee3b5ee | |
51 | user: test |
|
51 | user: test | |
52 |
date: |
|
52 | date: Thu Jan 01 00:00:00 1970 +0000 | |
53 | summary: 5 |
|
53 | summary: 5 | |
54 |
|
54 | |||
55 |
changeset: 6: |
|
55 | changeset: 6:e9229f2de384 | |
56 | user: test |
|
56 | user: test | |
57 |
date: |
|
57 | date: Thu Jan 01 00:00:00 1970 +0000 | |
58 | summary: 6 |
|
58 | summary: 6 | |
59 |
|
59 | |||
60 |
changeset: 7:d |
|
60 | changeset: 7:d152815bb8db | |
61 | user: test |
|
61 | user: test | |
62 |
date: |
|
62 | date: Thu Jan 01 00:00:00 1970 +0000 | |
63 | summary: 7 |
|
63 | summary: 7 | |
64 |
|
64 | |||
65 |
changeset: 8: |
|
65 | changeset: 8:e4feb4ac9035 | |
66 | tag: tip |
|
66 | tag: tip | |
67 | user: test |
|
67 | user: test | |
68 |
date: |
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 | |
69 | summary: 8 |
|
69 | summary: 8 | |
70 |
|
70 | |||
71 | $ hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
71 | $ hg -R new incoming -r 4 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
72 | comparing with http://localhost:$HGPORT/ |
|
72 | comparing with http://localhost:$HGPORT/ | |
73 |
changeset: 0: |
|
73 | changeset: 0:00a43fa82f62 | |
74 | user: test |
|
74 | user: test | |
75 |
date: |
|
75 | date: Thu Jan 01 00:00:00 1970 +0000 | |
76 | summary: 0 |
|
76 | summary: 0 | |
77 |
|
77 | |||
78 |
changeset: 1: |
|
78 | changeset: 1:5460a410df01 | |
79 | user: test |
|
79 | user: test | |
80 |
date: |
|
80 | date: Thu Jan 01 00:00:00 1970 +0000 | |
81 | summary: 1 |
|
81 | summary: 1 | |
82 |
|
82 | |||
83 |
changeset: 2: |
|
83 | changeset: 2:d9f42cd1a1ec | |
84 | user: test |
|
84 | user: test | |
85 |
date: |
|
85 | date: Thu Jan 01 00:00:00 1970 +0000 | |
86 | summary: 2 |
|
86 | summary: 2 | |
87 |
|
87 | |||
88 |
changeset: 3: |
|
88 | changeset: 3:376476025137 | |
89 | user: test |
|
89 | user: test | |
90 |
date: |
|
90 | date: Thu Jan 01 00:00:00 1970 +0000 | |
91 | summary: 3 |
|
91 | summary: 3 | |
92 |
|
92 | |||
93 |
changeset: 4: |
|
93 | changeset: 4:70d7eb252d49 | |
94 | tag: tip |
|
94 | tag: tip | |
95 | user: test |
|
95 | user: test | |
96 |
date: |
|
96 | date: Thu Jan 01 00:00:00 1970 +0000 | |
97 | summary: 4 |
|
97 | summary: 4 | |
98 |
|
98 | |||
99 |
|
99 | |||
@@ -101,77 +101,77 b' local incoming' | |||||
101 |
|
101 | |||
102 | $ hg -R new incoming test |
|
102 | $ hg -R new incoming test | |
103 | comparing with test |
|
103 | comparing with test | |
104 |
changeset: 0: |
|
104 | changeset: 0:00a43fa82f62 | |
105 | user: test |
|
105 | user: test | |
106 |
date: |
|
106 | date: Thu Jan 01 00:00:00 1970 +0000 | |
107 | summary: 0 |
|
107 | summary: 0 | |
108 |
|
108 | |||
109 |
changeset: 1: |
|
109 | changeset: 1:5460a410df01 | |
110 | user: test |
|
110 | user: test | |
111 |
date: |
|
111 | date: Thu Jan 01 00:00:00 1970 +0000 | |
112 | summary: 1 |
|
112 | summary: 1 | |
113 |
|
113 | |||
114 |
changeset: 2: |
|
114 | changeset: 2:d9f42cd1a1ec | |
115 | user: test |
|
115 | user: test | |
116 |
date: |
|
116 | date: Thu Jan 01 00:00:00 1970 +0000 | |
117 | summary: 2 |
|
117 | summary: 2 | |
118 |
|
118 | |||
119 |
changeset: 3: |
|
119 | changeset: 3:376476025137 | |
120 | user: test |
|
120 | user: test | |
121 |
date: |
|
121 | date: Thu Jan 01 00:00:00 1970 +0000 | |
122 | summary: 3 |
|
122 | summary: 3 | |
123 |
|
123 | |||
124 |
changeset: 4: |
|
124 | changeset: 4:70d7eb252d49 | |
125 | user: test |
|
125 | user: test | |
126 |
date: |
|
126 | date: Thu Jan 01 00:00:00 1970 +0000 | |
127 | summary: 4 |
|
127 | summary: 4 | |
128 |
|
128 | |||
129 |
changeset: 5: |
|
129 | changeset: 5:ad284ee3b5ee | |
130 | user: test |
|
130 | user: test | |
131 |
date: |
|
131 | date: Thu Jan 01 00:00:00 1970 +0000 | |
132 | summary: 5 |
|
132 | summary: 5 | |
133 |
|
133 | |||
134 |
changeset: 6: |
|
134 | changeset: 6:e9229f2de384 | |
135 | user: test |
|
135 | user: test | |
136 |
date: |
|
136 | date: Thu Jan 01 00:00:00 1970 +0000 | |
137 | summary: 6 |
|
137 | summary: 6 | |
138 |
|
138 | |||
139 |
changeset: 7:d |
|
139 | changeset: 7:d152815bb8db | |
140 | user: test |
|
140 | user: test | |
141 |
date: |
|
141 | date: Thu Jan 01 00:00:00 1970 +0000 | |
142 | summary: 7 |
|
142 | summary: 7 | |
143 |
|
143 | |||
144 |
changeset: 8: |
|
144 | changeset: 8:e4feb4ac9035 | |
145 | tag: tip |
|
145 | tag: tip | |
146 | user: test |
|
146 | user: test | |
147 |
date: |
|
147 | date: Thu Jan 01 00:00:00 1970 +0000 | |
148 | summary: 8 |
|
148 | summary: 8 | |
149 |
|
149 | |||
150 | $ hg -R new incoming -r 4 test |
|
150 | $ hg -R new incoming -r 4 test | |
151 | comparing with test |
|
151 | comparing with test | |
152 |
changeset: 0: |
|
152 | changeset: 0:00a43fa82f62 | |
153 | user: test |
|
153 | user: test | |
154 |
date: |
|
154 | date: Thu Jan 01 00:00:00 1970 +0000 | |
155 | summary: 0 |
|
155 | summary: 0 | |
156 |
|
156 | |||
157 |
changeset: 1: |
|
157 | changeset: 1:5460a410df01 | |
158 | user: test |
|
158 | user: test | |
159 |
date: |
|
159 | date: Thu Jan 01 00:00:00 1970 +0000 | |
160 | summary: 1 |
|
160 | summary: 1 | |
161 |
|
161 | |||
162 |
changeset: 2: |
|
162 | changeset: 2:d9f42cd1a1ec | |
163 | user: test |
|
163 | user: test | |
164 |
date: |
|
164 | date: Thu Jan 01 00:00:00 1970 +0000 | |
165 | summary: 2 |
|
165 | summary: 2 | |
166 |
|
166 | |||
167 |
changeset: 3: |
|
167 | changeset: 3:376476025137 | |
168 | user: test |
|
168 | user: test | |
169 |
date: |
|
169 | date: Thu Jan 01 00:00:00 1970 +0000 | |
170 | summary: 3 |
|
170 | summary: 3 | |
171 |
|
171 | |||
172 |
changeset: 4: |
|
172 | changeset: 4:70d7eb252d49 | |
173 | user: test |
|
173 | user: test | |
174 |
date: |
|
174 | date: Thu Jan 01 00:00:00 1970 +0000 | |
175 | summary: 4 |
|
175 | summary: 4 | |
176 |
|
176 | |||
177 |
|
177 | |||
@@ -179,14 +179,14 b' limit to 2 changesets' | |||||
179 |
|
179 | |||
180 | $ hg -R new incoming -l 2 test |
|
180 | $ hg -R new incoming -l 2 test | |
181 | comparing with test |
|
181 | comparing with test | |
182 |
changeset: 0: |
|
182 | changeset: 0:00a43fa82f62 | |
183 | user: test |
|
183 | user: test | |
184 |
date: |
|
184 | date: Thu Jan 01 00:00:00 1970 +0000 | |
185 | summary: 0 |
|
185 | summary: 0 | |
186 |
|
186 | |||
187 |
changeset: 1: |
|
187 | changeset: 1:5460a410df01 | |
188 | user: test |
|
188 | user: test | |
189 |
date: |
|
189 | date: Thu Jan 01 00:00:00 1970 +0000 | |
190 | summary: 1 |
|
190 | summary: 1 | |
191 |
|
191 | |||
192 |
|
192 | |||
@@ -194,9 +194,9 b' limit to 2 changesets, test with -p --gi' | |||||
194 |
|
194 | |||
195 | $ hg -R new incoming -l 2 -p --git test |
|
195 | $ hg -R new incoming -l 2 -p --git test | |
196 | comparing with test |
|
196 | comparing with test | |
197 |
changeset: 0: |
|
197 | changeset: 0:00a43fa82f62 | |
198 | user: test |
|
198 | user: test | |
199 |
date: |
|
199 | date: Thu Jan 01 00:00:00 1970 +0000 | |
200 | summary: 0 |
|
200 | summary: 0 | |
201 |
|
201 | |||
202 | diff --git a/foo b/foo |
|
202 | diff --git a/foo b/foo | |
@@ -206,9 +206,9 b' limit to 2 changesets, test with -p --gi' | |||||
206 | @@ -0,0 +1,1 @@ |
|
206 | @@ -0,0 +1,1 @@ | |
207 | +0 |
|
207 | +0 | |
208 |
|
208 | |||
209 |
changeset: 1: |
|
209 | changeset: 1:5460a410df01 | |
210 | user: test |
|
210 | user: test | |
211 |
date: |
|
211 | date: Thu Jan 01 00:00:00 1970 +0000 | |
212 | summary: 1 |
|
212 | summary: 1 | |
213 |
|
213 | |||
214 | diff --git a/foo b/foo |
|
214 | diff --git a/foo b/foo | |
@@ -223,98 +223,98 b' test with --bundle' | |||||
223 |
|
223 | |||
224 | $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
224 | $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
225 | comparing with http://localhost:$HGPORT/ |
|
225 | comparing with http://localhost:$HGPORT/ | |
226 |
changeset: 0: |
|
226 | changeset: 0:00a43fa82f62 | |
227 | user: test |
|
227 | user: test | |
228 |
date: |
|
228 | date: Thu Jan 01 00:00:00 1970 +0000 | |
229 | summary: 0 |
|
229 | summary: 0 | |
230 |
|
230 | |||
231 |
changeset: 1: |
|
231 | changeset: 1:5460a410df01 | |
232 | user: test |
|
232 | user: test | |
233 |
date: |
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 | |
234 | summary: 1 |
|
234 | summary: 1 | |
235 |
|
235 | |||
236 |
changeset: 2: |
|
236 | changeset: 2:d9f42cd1a1ec | |
237 | user: test |
|
237 | user: test | |
238 |
date: |
|
238 | date: Thu Jan 01 00:00:00 1970 +0000 | |
239 | summary: 2 |
|
239 | summary: 2 | |
240 |
|
240 | |||
241 |
changeset: 3: |
|
241 | changeset: 3:376476025137 | |
242 | user: test |
|
242 | user: test | |
243 |
date: |
|
243 | date: Thu Jan 01 00:00:00 1970 +0000 | |
244 | summary: 3 |
|
244 | summary: 3 | |
245 |
|
245 | |||
246 |
changeset: 4: |
|
246 | changeset: 4:70d7eb252d49 | |
247 | user: test |
|
247 | user: test | |
248 |
date: |
|
248 | date: Thu Jan 01 00:00:00 1970 +0000 | |
249 | summary: 4 |
|
249 | summary: 4 | |
250 |
|
250 | |||
251 |
changeset: 5: |
|
251 | changeset: 5:ad284ee3b5ee | |
252 | user: test |
|
252 | user: test | |
253 |
date: |
|
253 | date: Thu Jan 01 00:00:00 1970 +0000 | |
254 | summary: 5 |
|
254 | summary: 5 | |
255 |
|
255 | |||
256 |
changeset: 6: |
|
256 | changeset: 6:e9229f2de384 | |
257 | user: test |
|
257 | user: test | |
258 |
date: |
|
258 | date: Thu Jan 01 00:00:00 1970 +0000 | |
259 | summary: 6 |
|
259 | summary: 6 | |
260 |
|
260 | |||
261 |
changeset: 7:d |
|
261 | changeset: 7:d152815bb8db | |
262 | user: test |
|
262 | user: test | |
263 |
date: |
|
263 | date: Thu Jan 01 00:00:00 1970 +0000 | |
264 | summary: 7 |
|
264 | summary: 7 | |
265 |
|
265 | |||
266 |
changeset: 8: |
|
266 | changeset: 8:e4feb4ac9035 | |
267 | tag: tip |
|
267 | tag: tip | |
268 | user: test |
|
268 | user: test | |
269 |
date: |
|
269 | date: Thu Jan 01 00:00:00 1970 +0000 | |
270 | summary: 8 |
|
270 | summary: 8 | |
271 |
|
271 | |||
272 | $ hg -R new incoming --bundle test2.hg test |
|
272 | $ hg -R new incoming --bundle test2.hg test | |
273 | comparing with test |
|
273 | comparing with test | |
274 |
changeset: 0: |
|
274 | changeset: 0:00a43fa82f62 | |
275 | user: test |
|
275 | user: test | |
276 |
date: |
|
276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
277 | summary: 0 |
|
277 | summary: 0 | |
278 |
|
278 | |||
279 |
changeset: 1: |
|
279 | changeset: 1:5460a410df01 | |
280 | user: test |
|
280 | user: test | |
281 |
date: |
|
281 | date: Thu Jan 01 00:00:00 1970 +0000 | |
282 | summary: 1 |
|
282 | summary: 1 | |
283 |
|
283 | |||
284 |
changeset: 2: |
|
284 | changeset: 2:d9f42cd1a1ec | |
285 | user: test |
|
285 | user: test | |
286 |
date: |
|
286 | date: Thu Jan 01 00:00:00 1970 +0000 | |
287 | summary: 2 |
|
287 | summary: 2 | |
288 |
|
288 | |||
289 |
changeset: 3: |
|
289 | changeset: 3:376476025137 | |
290 | user: test |
|
290 | user: test | |
291 |
date: |
|
291 | date: Thu Jan 01 00:00:00 1970 +0000 | |
292 | summary: 3 |
|
292 | summary: 3 | |
293 |
|
293 | |||
294 |
changeset: 4: |
|
294 | changeset: 4:70d7eb252d49 | |
295 | user: test |
|
295 | user: test | |
296 |
date: |
|
296 | date: Thu Jan 01 00:00:00 1970 +0000 | |
297 | summary: 4 |
|
297 | summary: 4 | |
298 |
|
298 | |||
299 |
changeset: 5: |
|
299 | changeset: 5:ad284ee3b5ee | |
300 | user: test |
|
300 | user: test | |
301 |
date: |
|
301 | date: Thu Jan 01 00:00:00 1970 +0000 | |
302 | summary: 5 |
|
302 | summary: 5 | |
303 |
|
303 | |||
304 |
changeset: 6: |
|
304 | changeset: 6:e9229f2de384 | |
305 | user: test |
|
305 | user: test | |
306 |
date: |
|
306 | date: Thu Jan 01 00:00:00 1970 +0000 | |
307 | summary: 6 |
|
307 | summary: 6 | |
308 |
|
308 | |||
309 |
changeset: 7:d |
|
309 | changeset: 7:d152815bb8db | |
310 | user: test |
|
310 | user: test | |
311 |
date: |
|
311 | date: Thu Jan 01 00:00:00 1970 +0000 | |
312 | summary: 7 |
|
312 | summary: 7 | |
313 |
|
313 | |||
314 |
changeset: 8: |
|
314 | changeset: 8:e4feb4ac9035 | |
315 | tag: tip |
|
315 | tag: tip | |
316 | user: test |
|
316 | user: test | |
317 |
date: |
|
317 | date: Thu Jan 01 00:00:00 1970 +0000 | |
318 | summary: 8 |
|
318 | summary: 8 | |
319 |
|
319 | |||
320 |
|
320 | |||
@@ -336,17 +336,17 b' test the resulting bundles' | |||||
336 | added 9 changesets with 9 changes to 1 files |
|
336 | added 9 changesets with 9 changes to 1 files | |
337 | (run 'hg update' to get a working copy) |
|
337 | (run 'hg update' to get a working copy) | |
338 | $ hg -R temp tip |
|
338 | $ hg -R temp tip | |
339 |
changeset: 8: |
|
339 | changeset: 8:e4feb4ac9035 | |
340 | tag: tip |
|
340 | tag: tip | |
341 | user: test |
|
341 | user: test | |
342 |
date: |
|
342 | date: Thu Jan 01 00:00:00 1970 +0000 | |
343 | summary: 8 |
|
343 | summary: 8 | |
344 |
|
344 | |||
345 | $ hg -R temp2 tip |
|
345 | $ hg -R temp2 tip | |
346 |
changeset: 8: |
|
346 | changeset: 8:e4feb4ac9035 | |
347 | tag: tip |
|
347 | tag: tip | |
348 | user: test |
|
348 | user: test | |
349 |
date: |
|
349 | date: Thu Jan 01 00:00:00 1970 +0000 | |
350 | summary: 8 |
|
350 | summary: 8 | |
351 |
|
351 | |||
352 |
|
352 | |||
@@ -360,7 +360,7 b' test outgoing' | |||||
360 | $ cd test-dev |
|
360 | $ cd test-dev | |
361 | $ for i in 9 10 11 12 13; do |
|
361 | $ for i in 9 10 11 12 13; do | |
362 | > echo $i >> foo |
|
362 | > echo $i >> foo | |
363 |
> hg commit -A -m $i |
|
363 | > hg commit -A -m $i | |
364 | > done |
|
364 | > done | |
365 | $ hg verify |
|
365 | $ hg verify | |
366 | checking changesets |
|
366 | checking changesets | |
@@ -372,30 +372,30 b' test outgoing' | |||||
372 | $ hg -R test-dev outgoing test |
|
372 | $ hg -R test-dev outgoing test | |
373 | comparing with test |
|
373 | comparing with test | |
374 | searching for changes |
|
374 | searching for changes | |
375 |
changeset: 9: |
|
375 | changeset: 9:d89d4abea5bc | |
376 | user: test |
|
376 | user: test | |
377 |
date: |
|
377 | date: Thu Jan 01 00:00:00 1970 +0000 | |
378 | summary: 9 |
|
378 | summary: 9 | |
379 |
|
379 | |||
380 |
changeset: 10: |
|
380 | changeset: 10:820095aa7158 | |
381 | user: test |
|
381 | user: test | |
382 |
date: |
|
382 | date: Thu Jan 01 00:00:00 1970 +0000 | |
383 | summary: 10 |
|
383 | summary: 10 | |
384 |
|
384 | |||
385 |
changeset: 11:0 |
|
385 | changeset: 11:09ede2f3a638 | |
386 | user: test |
|
386 | user: test | |
387 |
date: |
|
387 | date: Thu Jan 01 00:00:00 1970 +0000 | |
388 | summary: 11 |
|
388 | summary: 11 | |
389 |
|
389 | |||
390 |
changeset: 12: |
|
390 | changeset: 12:e576b1bed305 | |
391 | user: test |
|
391 | user: test | |
392 |
date: |
|
392 | date: Thu Jan 01 00:00:00 1970 +0000 | |
393 | summary: 12 |
|
393 | summary: 12 | |
394 |
|
394 | |||
395 |
changeset: 13: |
|
395 | changeset: 13:96bbff09a7cc | |
396 | tag: tip |
|
396 | tag: tip | |
397 | user: test |
|
397 | user: test | |
398 |
date: |
|
398 | date: Thu Jan 01 00:00:00 1970 +0000 | |
399 | summary: 13 |
|
399 | summary: 13 | |
400 |
|
400 | |||
401 |
|
401 | |||
@@ -404,65 +404,65 b' limit to 3 changesets' | |||||
404 | $ hg -R test-dev outgoing -l 3 test |
|
404 | $ hg -R test-dev outgoing -l 3 test | |
405 | comparing with test |
|
405 | comparing with test | |
406 | searching for changes |
|
406 | searching for changes | |
407 |
changeset: 9: |
|
407 | changeset: 9:d89d4abea5bc | |
408 | user: test |
|
408 | user: test | |
409 |
date: |
|
409 | date: Thu Jan 01 00:00:00 1970 +0000 | |
410 | summary: 9 |
|
410 | summary: 9 | |
411 |
|
411 | |||
412 |
changeset: 10: |
|
412 | changeset: 10:820095aa7158 | |
413 | user: test |
|
413 | user: test | |
414 |
date: |
|
414 | date: Thu Jan 01 00:00:00 1970 +0000 | |
415 | summary: 10 |
|
415 | summary: 10 | |
416 |
|
416 | |||
417 |
changeset: 11:0 |
|
417 | changeset: 11:09ede2f3a638 | |
418 | user: test |
|
418 | user: test | |
419 |
date: |
|
419 | date: Thu Jan 01 00:00:00 1970 +0000 | |
420 | summary: 11 |
|
420 | summary: 11 | |
421 |
|
421 | |||
422 | $ hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
422 | $ hg -R test-dev outgoing http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
423 | comparing with http://localhost:$HGPORT/ |
|
423 | comparing with http://localhost:$HGPORT/ | |
424 | searching for changes |
|
424 | searching for changes | |
425 |
changeset: 9: |
|
425 | changeset: 9:d89d4abea5bc | |
426 | user: test |
|
426 | user: test | |
427 |
date: |
|
427 | date: Thu Jan 01 00:00:00 1970 +0000 | |
428 | summary: 9 |
|
428 | summary: 9 | |
429 |
|
429 | |||
430 |
changeset: 10: |
|
430 | changeset: 10:820095aa7158 | |
431 | user: test |
|
431 | user: test | |
432 |
date: |
|
432 | date: Thu Jan 01 00:00:00 1970 +0000 | |
433 | summary: 10 |
|
433 | summary: 10 | |
434 |
|
434 | |||
435 |
changeset: 11:0 |
|
435 | changeset: 11:09ede2f3a638 | |
436 | user: test |
|
436 | user: test | |
437 |
date: |
|
437 | date: Thu Jan 01 00:00:00 1970 +0000 | |
438 | summary: 11 |
|
438 | summary: 11 | |
439 |
|
439 | |||
440 |
changeset: 12: |
|
440 | changeset: 12:e576b1bed305 | |
441 | user: test |
|
441 | user: test | |
442 |
date: |
|
442 | date: Thu Jan 01 00:00:00 1970 +0000 | |
443 | summary: 12 |
|
443 | summary: 12 | |
444 |
|
444 | |||
445 |
changeset: 13: |
|
445 | changeset: 13:96bbff09a7cc | |
446 | tag: tip |
|
446 | tag: tip | |
447 | user: test |
|
447 | user: test | |
448 |
date: |
|
448 | date: Thu Jan 01 00:00:00 1970 +0000 | |
449 | summary: 13 |
|
449 | summary: 13 | |
450 |
|
450 | |||
451 | $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
451 | $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
452 | comparing with http://localhost:$HGPORT/ |
|
452 | comparing with http://localhost:$HGPORT/ | |
453 | searching for changes |
|
453 | searching for changes | |
454 |
changeset: 9: |
|
454 | changeset: 9:d89d4abea5bc | |
455 | user: test |
|
455 | user: test | |
456 |
date: |
|
456 | date: Thu Jan 01 00:00:00 1970 +0000 | |
457 | summary: 9 |
|
457 | summary: 9 | |
458 |
|
458 | |||
459 |
changeset: 10: |
|
459 | changeset: 10:820095aa7158 | |
460 | user: test |
|
460 | user: test | |
461 |
date: |
|
461 | date: Thu Jan 01 00:00:00 1970 +0000 | |
462 | summary: 10 |
|
462 | summary: 10 | |
463 |
|
463 | |||
464 |
changeset: 11:0 |
|
464 | changeset: 11:09ede2f3a638 | |
465 | user: test |
|
465 | user: test | |
466 |
date: |
|
466 | date: Thu Jan 01 00:00:00 1970 +0000 | |
467 | summary: 11 |
|
467 | summary: 11 | |
468 |
|
468 |
@@ -43,7 +43,7 b" creating 'local'" | |||||
43 | store |
|
43 | store | |
44 | fncache |
|
44 | fncache | |
45 | $ echo this > local/foo |
|
45 | $ echo this > local/foo | |
46 |
$ hg ci --cwd local -A -m "init" |
|
46 | $ hg ci --cwd local -A -m "init" | |
47 | adding foo |
|
47 | adding foo | |
48 |
|
48 | |||
49 | creating repo with format.usestore=false |
|
49 | creating repo with format.usestore=false | |
@@ -71,10 +71,10 b' init+push to remote2' | |||||
71 | $ hg init -e "python ./dummyssh" ssh://user@dummy/remote2 |
|
71 | $ hg init -e "python ./dummyssh" ssh://user@dummy/remote2 | |
72 | $ hg incoming -R remote2 local |
|
72 | $ hg incoming -R remote2 local | |
73 | comparing with local |
|
73 | comparing with local | |
74 |
changeset: 0: |
|
74 | changeset: 0:08b9e9f63b32 | |
75 | tag: tip |
|
75 | tag: tip | |
76 | user: test |
|
76 | user: test | |
77 |
date: |
|
77 | date: Thu Jan 01 00:00:00 1970 +0000 | |
78 | summary: init |
|
78 | summary: init | |
79 |
|
79 | |||
80 |
|
80 | |||
@@ -121,11 +121,11 b' output of dummyssh' | |||||
121 | comparing repositories |
|
121 | comparing repositories | |
122 |
|
122 | |||
123 | $ hg tip -q -R local |
|
123 | $ hg tip -q -R local | |
124 | 0:c4e059d443be |
|
124 | 0:08b9e9f63b32 | |
125 | $ hg tip -q -R remote1 |
|
125 | $ hg tip -q -R remote1 | |
126 | 0:c4e059d443be |
|
126 | 0:08b9e9f63b32 | |
127 | $ hg tip -q -R remote2 |
|
127 | $ hg tip -q -R remote2 | |
128 | 0:c4e059d443be |
|
128 | 0:08b9e9f63b32 | |
129 |
|
129 | |||
130 | check names for repositories (clashes with URL schemes, special chars) |
|
130 | check names for repositories (clashes with URL schemes, special chars) | |
131 |
|
131 |
@@ -6,15 +6,15 b' cd t' | |||||
6 | hg init |
|
6 | hg init | |
7 | mkdir src |
|
7 | mkdir src | |
8 | echo a > src/a.c |
|
8 | echo a > src/a.c | |
9 | hg ci -Ama -d "10000000 0" |
|
9 | hg ci -Ama | |
10 |
|
10 | |||
11 | hg mv src source |
|
11 | hg mv src source | |
12 |
hg ci -Ammove |
|
12 | hg ci -Ammove | |
13 |
|
13 | |||
14 | hg co -C 0 |
|
14 | hg co -C 0 | |
15 | echo new > src/a.c |
|
15 | echo new > src/a.c | |
16 | echo compiled > src/a.o |
|
16 | echo compiled > src/a.o | |
17 |
hg ci -mupdate |
|
17 | hg ci -mupdate | |
18 |
|
18 | |||
19 | hg st |
|
19 | hg st | |
20 |
|
20 |
@@ -4,15 +4,15 b' mkdir t' | |||||
4 | cd t |
|
4 | cd t | |
5 | hg init |
|
5 | hg init | |
6 | echo a > a |
|
6 | echo a > a | |
7 | hg ci -Ama -d '1000000000 0' |
|
7 | hg ci -Ama | |
8 | echo b > b |
|
8 | echo b > b | |
9 | hg branch b |
|
9 | hg branch b | |
10 | hg ci -Amb -d '1000000000 0' |
|
10 | hg ci -Amb | |
11 | hg co -C 0 |
|
11 | hg co -C 0 | |
12 |
|
12 | |||
13 | echo fast-forward |
|
13 | echo fast-forward | |
14 | hg merge b |
|
14 | hg merge b | |
15 |
hg ci -Ammerge |
|
15 | hg ci -Ammerge | |
16 |
|
16 | |||
17 | echo bogus fast-forward should fail |
|
17 | echo bogus fast-forward should fail | |
18 | hg merge b |
|
18 | hg merge b |
@@ -21,13 +21,13 b' echo 0 > t/b' | |||||
21 | echo 0 > t/e.h |
|
21 | echo 0 > t/e.h | |
22 | mkdir dir.h |
|
22 | mkdir dir.h | |
23 | echo 0 > dir.h/foo |
|
23 | echo 0 > dir.h/foo | |
24 |
hg ci -A -m m |
|
24 | hg ci -A -m m | |
25 | touch nottracked |
|
25 | touch nottracked | |
26 | hglocate a && echo locate succeeded || echo locate failed |
|
26 | hglocate a && echo locate succeeded || echo locate failed | |
27 | hglocate NONEXISTENT && echo locate succeeded || echo locate failed |
|
27 | hglocate NONEXISTENT && echo locate succeeded || echo locate failed | |
28 | hglocate |
|
28 | hglocate | |
29 | hg rm a |
|
29 | hg rm a | |
30 | hg ci -m m -d "1000000 0" |
|
30 | hg ci -m m | |
31 | hglocate a |
|
31 | hglocate a | |
32 | hglocate NONEXISTENT |
|
32 | hglocate NONEXISTENT | |
33 | hglocate relpath:NONEXISTENT |
|
33 | hglocate relpath:NONEXISTENT |
@@ -1,5 +1,5 b'' | |||||
1 | $ hgcommit() { |
|
1 | $ hgcommit() { | |
2 |
> hg commit -u user |
|
2 | > hg commit -u user "$@" | |
3 | > } |
|
3 | > } | |
4 |
|
4 | |||
5 | $ hg init clhead |
|
5 | $ hg init clhead |
@@ -11,18 +11,18 b' echo "# initial file contents"' | |||||
11 | echo "line 1" > f |
|
11 | echo "line 1" > f | |
12 | echo "line 2" >> f |
|
12 | echo "line 2" >> f | |
13 | echo "line 3" >> f |
|
13 | echo "line 3" >> f | |
14 |
hg commit -Am "revision 0" |
|
14 | hg commit -Am "revision 0" | |
15 | cat f |
|
15 | cat f | |
16 | echo "# branch 1: editing line 1" |
|
16 | echo "# branch 1: editing line 1" | |
17 | sed 's/line 1/first line/' f > f.new |
|
17 | sed 's/line 1/first line/' f > f.new | |
18 | mv f.new f |
|
18 | mv f.new f | |
19 |
hg commit -Am "edited first line" |
|
19 | hg commit -Am "edited first line" | |
20 |
|
20 | |||
21 | echo "# branch 2: editing line 3" |
|
21 | echo "# branch 2: editing line 3" | |
22 | hg update 0 |
|
22 | hg update 0 | |
23 | sed 's/line 3/third line/' f > f.new |
|
23 | sed 's/line 3/third line/' f > f.new | |
24 | mv f.new f |
|
24 | mv f.new f | |
25 |
hg commit -Am "edited third line" |
|
25 | hg commit -Am "edited third line" | |
26 |
|
26 | |||
27 | echo "# merge using internal:fail tool" |
|
27 | echo "# merge using internal:fail tool" | |
28 | echo "[merge-patterns]" > .hg/hgrc |
|
28 | echo "[merge-patterns]" > .hg/hgrc |
@@ -11,7 +11,7 b' for i in 1 2 3 4 5 6 7 8 9; do' | |||||
11 | echo "merge ok $i" >> zzz1_merge_ok |
|
11 | echo "merge ok $i" >> zzz1_merge_ok | |
12 | done |
|
12 | done | |
13 | echo "merge bad" > zzz2_merge_bad |
|
13 | echo "merge bad" > zzz2_merge_bad | |
14 |
hg ci -Am "revision 0" |
|
14 | hg ci -Am "revision 0" | |
15 |
|
15 | |||
16 | echo "# revision 1" |
|
16 | echo "# revision 1" | |
17 | hg rm remove |
|
17 | hg rm remove | |
@@ -22,7 +22,7 b' hg add added' | |||||
22 | echo "new first line" > zzz1_merge_ok |
|
22 | echo "new first line" > zzz1_merge_ok | |
23 | hg cat zzz1_merge_ok >> zzz1_merge_ok |
|
23 | hg cat zzz1_merge_ok >> zzz1_merge_ok | |
24 | echo "new last line" >> zzz2_merge_bad |
|
24 | echo "new last line" >> zzz2_merge_bad | |
25 |
hg ci -m "revision 1" |
|
25 | hg ci -m "revision 1" | |
26 |
|
26 | |||
27 | echo "# local changes to revision 0" |
|
27 | echo "# local changes to revision 0" | |
28 | hg co 0 |
|
28 | hg co 0 |
@@ -6,9 +6,9 b' hg init' | |||||
6 | echo "added file1" > file1 |
|
6 | echo "added file1" > file1 | |
7 | echo "added file2" > file2 |
|
7 | echo "added file2" > file2 | |
8 | hg add file1 file2 |
|
8 | hg add file1 file2 | |
9 |
hg commit -m "added file1 and file2" |
|
9 | hg commit -m "added file1 and file2" | |
10 | echo "changed file1" >> file1 |
|
10 | echo "changed file1" >> file1 | |
11 |
hg commit -m "changed file1" |
|
11 | hg commit -m "changed file1" | |
12 | hg -q log |
|
12 | hg -q log | |
13 | hg id |
|
13 | hg id | |
14 | hg update -C 0 |
|
14 | hg update -C 0 |
@@ -1,23 +1,23 b'' | |||||
1 | 1:016807e6fdaf |
|
1 | 1:08a16e8e4408 | |
2 | 0:eb43f19ff115 |
|
2 | 0:d29c767a4b52 | |
3 | 016807e6fdaf tip |
|
3 | 08a16e8e4408 tip | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | eb43f19ff115 |
|
5 | d29c767a4b52 | |
6 | eb43f19ff115+ |
|
6 | d29c767a4b52+ | |
7 | reverting file1 |
|
7 | reverting file1 | |
8 | ? file1.orig |
|
8 | ? file1.orig | |
9 | eb43f19ff115 |
|
9 | d29c767a4b52 | |
10 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 | ? file1.orig |
|
11 | ? file1.orig | |
12 | 016807e6fdaf tip |
|
12 | 08a16e8e4408 tip | |
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 | ? file1.orig |
|
15 | ? file1.orig | |
16 | 016807e6fdaf tip |
|
16 | 08a16e8e4408 tip | |
17 | ? file1.orig |
|
17 | ? file1.orig | |
18 | 016807e6fdaf tip |
|
18 | 08a16e8e4408 tip | |
19 | ? file1.orig |
|
19 | ? file1.orig | |
20 | 016807e6fdaf tip |
|
20 | 08a16e8e4408 tip | |
21 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 | ? file1.orig |
|
22 | ? file1.orig | |
23 | 016807e6fdaf tip |
|
23 | 08a16e8e4408 tip |
@@ -7,9 +7,9 b' echo "added file1" > file1' | |||||
7 | echo "another line of text" >> file1 |
|
7 | echo "another line of text" >> file1 | |
8 | echo "added file2" > file2 |
|
8 | echo "added file2" > file2 | |
9 | hg add file1 file2 |
|
9 | hg add file1 file2 | |
10 |
hg commit -m "added file1 and file2" |
|
10 | hg commit -m "added file1 and file2" | |
11 | echo "changed file1" >> file1 |
|
11 | echo "changed file1" >> file1 | |
12 |
hg commit -m "changed file1" |
|
12 | hg commit -m "changed file1" | |
13 | hg -q log |
|
13 | hg -q log | |
14 | hg id |
|
14 | hg id | |
15 | hg update -C 0 |
|
15 | hg update -C 0 |
@@ -1,20 +1,20 b'' | |||||
1 | 1:f248da0d4c3e |
|
1 | 1:dfab7f3c2efb | |
2 | 0:9eca13a34789 |
|
2 | 0:c3fa057dd86f | |
3 | f248da0d4c3e tip |
|
3 | dfab7f3c2efb tip | |
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 | 9eca13a34789 |
|
5 | c3fa057dd86f | |
6 | 9eca13a34789+ |
|
6 | c3fa057dd86f+ | |
7 | reverting file1 |
|
7 | reverting file1 | |
8 | 9eca13a34789 |
|
8 | c3fa057dd86f | |
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | f248da0d4c3e tip |
|
10 | dfab7f3c2efb tip | |
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | merging file1 |
|
12 | merging file1 | |
13 | warning: conflicts during merge. |
|
13 | warning: conflicts during merge. | |
14 | merging file1 failed! |
|
14 | merging file1 failed! | |
15 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
15 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
16 | use 'hg resolve' to retry unresolved file merges |
|
16 | use 'hg resolve' to retry unresolved file merges | |
17 |
diff -r |
|
17 | diff -r dfab7f3c2efb file1 | |
18 | --- a/file1 |
|
18 | --- a/file1 | |
19 | +++ b/file1 |
|
19 | +++ b/file1 | |
20 | @@ -1,3 +1,7 @@ |
|
20 | @@ -1,3 +1,7 @@ | |
@@ -27,12 +27,12 b' diff -r f248da0d4c3e file1' | |||||
27 | +>>>>>>> other |
|
27 | +>>>>>>> other | |
28 | M file1 |
|
28 | M file1 | |
29 | ? file1.orig |
|
29 | ? file1.orig | |
30 | f248da0d4c3e+ tip |
|
30 | dfab7f3c2efb+ tip | |
31 | reverting file1 |
|
31 | reverting file1 | |
32 | ? file1.orig |
|
32 | ? file1.orig | |
33 | f248da0d4c3e tip |
|
33 | dfab7f3c2efb tip | |
34 | ? file1.orig |
|
34 | ? file1.orig | |
35 | f248da0d4c3e tip |
|
35 | dfab7f3c2efb tip | |
36 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 | ? file1.orig |
|
37 | ? file1.orig | |
38 | f248da0d4c3e tip |
|
38 | dfab7f3c2efb tip |
@@ -9,23 +9,23 b' hg init' | |||||
9 | echo "# revision 0" |
|
9 | echo "# revision 0" | |
10 | echo "revision 0" > f |
|
10 | echo "revision 0" > f | |
11 | echo "space" >> f |
|
11 | echo "space" >> f | |
12 |
hg commit -Am "revision 0" |
|
12 | hg commit -Am "revision 0" | |
13 |
|
13 | |||
14 | echo "# revision 1" |
|
14 | echo "# revision 1" | |
15 | echo "revision 1" > f |
|
15 | echo "revision 1" > f | |
16 | echo "space" >> f |
|
16 | echo "space" >> f | |
17 |
hg commit -Am "revision 1" |
|
17 | hg commit -Am "revision 1" | |
18 |
|
18 | |||
19 | hg update 0 > /dev/null |
|
19 | hg update 0 > /dev/null | |
20 | echo "# revision 2" |
|
20 | echo "# revision 2" | |
21 | echo "revision 2" > f |
|
21 | echo "revision 2" > f | |
22 | echo "space" >> f |
|
22 | echo "space" >> f | |
23 |
hg commit -Am "revision 2" |
|
23 | hg commit -Am "revision 2" | |
24 |
|
24 | |||
25 | hg update 0 > /dev/null |
|
25 | hg update 0 > /dev/null | |
26 | echo "# revision 3 - simple to merge" |
|
26 | echo "# revision 3 - simple to merge" | |
27 | echo "revision 3" >> f |
|
27 | echo "revision 3" >> f | |
28 |
hg commit -Am "revision 3" |
|
28 | hg commit -Am "revision 3" | |
29 |
|
29 | |||
30 |
|
30 | |||
31 | echo "[merge-tools]" > .hg/hgrc |
|
31 | echo "[merge-tools]" > .hg/hgrc |
@@ -17,30 +17,30 b'' | |||||
17 | $ hg init |
|
17 | $ hg init | |
18 | $ echo This is file a1 > a |
|
18 | $ echo This is file a1 > a | |
19 | $ hg add a |
|
19 | $ hg add a | |
20 |
$ hg commit -m "commit #0" |
|
20 | $ hg commit -m "commit #0" | |
21 | $ echo This is file b1 > b |
|
21 | $ echo This is file b1 > b | |
22 | $ hg add b |
|
22 | $ hg add b | |
23 |
$ hg commit -m "commit #1" |
|
23 | $ hg commit -m "commit #1" | |
24 |
|
24 | |||
25 | $ hg update 0 |
|
25 | $ hg update 0 | |
26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
27 | $ echo This is file c1 > c |
|
27 | $ echo This is file c1 > c | |
28 | $ hg add c |
|
28 | $ hg add c | |
29 |
$ hg commit -m "commit #2" |
|
29 | $ hg commit -m "commit #2" | |
30 | created new head |
|
30 | created new head | |
31 | $ echo This is file b1 > b |
|
31 | $ echo This is file b1 > b | |
32 | no merges expected |
|
32 | no merges expected | |
33 | $ hg merge -P 1 |
|
33 | $ hg merge -P 1 | |
34 |
changeset: 1: |
|
34 | changeset: 1:b8bb4a988f25 | |
35 | user: test |
|
35 | user: test | |
36 |
date: |
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 | |
37 | summary: commit #1 |
|
37 | summary: commit #1 | |
38 |
|
38 | |||
39 | $ hg merge 1 |
|
39 | $ hg merge 1 | |
40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
41 | (branch merge, don't forget to commit) |
|
41 | (branch merge, don't forget to commit) | |
42 | $ hg diff --nodates |
|
42 | $ hg diff --nodates | |
43 |
diff -r |
|
43 | diff -r 49035e18a8e6 b | |
44 | --- /dev/null |
|
44 | --- /dev/null | |
45 | +++ b/b |
|
45 | +++ b/b | |
46 | @@ -0,0 +1,1 @@ |
|
46 | @@ -0,0 +1,1 @@ | |
@@ -54,16 +54,16 b' no merges expected' | |||||
54 | $ hg init |
|
54 | $ hg init | |
55 | $ echo This is file a1 > a |
|
55 | $ echo This is file a1 > a | |
56 | $ hg add a |
|
56 | $ hg add a | |
57 |
$ hg commit -m "commit #0" |
|
57 | $ hg commit -m "commit #0" | |
58 | $ echo This is file b1 > b |
|
58 | $ echo This is file b1 > b | |
59 | $ hg add b |
|
59 | $ hg add b | |
60 |
$ hg commit -m "commit #1" |
|
60 | $ hg commit -m "commit #1" | |
61 |
|
61 | |||
62 | $ hg update 0 |
|
62 | $ hg update 0 | |
63 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
63 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
64 | $ echo This is file c1 > c |
|
64 | $ echo This is file c1 > c | |
65 | $ hg add c |
|
65 | $ hg add c | |
66 |
$ hg commit -m "commit #2" |
|
66 | $ hg commit -m "commit #2" | |
67 | created new head |
|
67 | created new head | |
68 | $ echo This is file b2 > b |
|
68 | $ echo This is file b2 > b | |
69 | merge should fail |
|
69 | merge should fail | |
@@ -76,7 +76,7 b' merge of b expected' | |||||
76 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
76 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
77 | (branch merge, don't forget to commit) |
|
77 | (branch merge, don't forget to commit) | |
78 | $ hg diff --nodates |
|
78 | $ hg diff --nodates | |
79 |
diff -r |
|
79 | diff -r 49035e18a8e6 b | |
80 | --- /dev/null |
|
80 | --- /dev/null | |
81 | +++ b/b |
|
81 | +++ b/b | |
82 | @@ -0,0 +1,1 @@ |
|
82 | @@ -0,0 +1,1 @@ | |
@@ -90,17 +90,17 b' merge of b expected' | |||||
90 | $ hg init |
|
90 | $ hg init | |
91 | $ echo This is file a1 > a |
|
91 | $ echo This is file a1 > a | |
92 | $ hg add a |
|
92 | $ hg add a | |
93 |
$ hg commit -m "commit #0" |
|
93 | $ hg commit -m "commit #0" | |
94 | $ echo This is file b1 > b |
|
94 | $ echo This is file b1 > b | |
95 | $ hg add b |
|
95 | $ hg add b | |
96 |
$ hg commit -m "commit #1" |
|
96 | $ hg commit -m "commit #1" | |
97 | $ echo This is file b22 > b |
|
97 | $ echo This is file b22 > b | |
98 |
$ hg commit -m "commit #2" |
|
98 | $ hg commit -m "commit #2" | |
99 | $ hg update 1 |
|
99 | $ hg update 1 | |
100 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
101 | $ echo This is file c1 > c |
|
101 | $ echo This is file c1 > c | |
102 | $ hg add c |
|
102 | $ hg add c | |
103 |
$ hg commit -m "commit #3" |
|
103 | $ hg commit -m "commit #3" | |
104 | created new head |
|
104 | created new head | |
105 |
|
105 | |||
106 | Contents of b should be "this is file b1" |
|
106 | Contents of b should be "this is file b1" | |
@@ -117,7 +117,7 b' merge fails' | |||||
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 | (branch merge, don't forget to commit) |
|
118 | (branch merge, don't forget to commit) | |
119 | $ hg diff --nodates |
|
119 | $ hg diff --nodates | |
120 | diff -r c1dd73cbf59f b |
|
120 | diff -r 85de557015a8 b | |
121 | --- a/b |
|
121 | --- a/b | |
122 | +++ b/b |
|
122 | +++ b/b | |
123 | @@ -1,1 +1,1 @@ |
|
123 | @@ -1,1 +1,1 @@ | |
@@ -132,17 +132,17 b' merge fails' | |||||
132 | $ hg init |
|
132 | $ hg init | |
133 | $ echo This is file a1 > a |
|
133 | $ echo This is file a1 > a | |
134 | $ hg add a |
|
134 | $ hg add a | |
135 |
$ hg commit -m "commit #0" |
|
135 | $ hg commit -m "commit #0" | |
136 | $ echo This is file b1 > b |
|
136 | $ echo This is file b1 > b | |
137 | $ hg add b |
|
137 | $ hg add b | |
138 |
$ hg commit -m "commit #1" |
|
138 | $ hg commit -m "commit #1" | |
139 | $ echo This is file b22 > b |
|
139 | $ echo This is file b22 > b | |
140 |
$ hg commit -m "commit #2" |
|
140 | $ hg commit -m "commit #2" | |
141 | $ hg update 1 |
|
141 | $ hg update 1 | |
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
143 | $ echo This is file c1 > c |
|
143 | $ echo This is file c1 > c | |
144 | $ hg add c |
|
144 | $ hg add c | |
145 |
$ hg commit -m "commit #3" |
|
145 | $ hg commit -m "commit #3" | |
146 | created new head |
|
146 | created new head | |
147 | $ echo This is file b33 > b |
|
147 | $ echo This is file b33 > b | |
148 | merge of b should fail |
|
148 | merge of b should fail | |
@@ -155,7 +155,7 b' merge of b expected' | |||||
155 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
155 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
156 | (branch merge, don't forget to commit) |
|
156 | (branch merge, don't forget to commit) | |
157 | $ hg diff --nodates |
|
157 | $ hg diff --nodates | |
158 | diff -r c1dd73cbf59f b |
|
158 | diff -r 85de557015a8 b | |
159 | --- a/b |
|
159 | --- a/b | |
160 | +++ b/b |
|
160 | +++ b/b | |
161 | @@ -1,1 +1,1 @@ |
|
161 | @@ -1,1 +1,1 @@ |
@@ -7,7 +7,7 b' but then local changes are added in the ' | |||||
7 | $ mkdir -p testdir |
|
7 | $ mkdir -p testdir | |
8 | $ echo a > testdir/a |
|
8 | $ echo a > testdir/a | |
9 | $ hg add testdir/a |
|
9 | $ hg add testdir/a | |
10 |
$ hg commit - |
|
10 | $ hg commit -m a | |
11 | $ cd .. |
|
11 | $ cd .. | |
12 |
|
12 | |||
13 | $ hg clone a b |
|
13 | $ hg clone a b | |
@@ -15,17 +15,17 b' but then local changes are added in the ' | |||||
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 | $ cd a |
|
16 | $ cd a | |
17 | $ echo alpha > testdir/a |
|
17 | $ echo alpha > testdir/a | |
18 |
$ hg commit - |
|
18 | $ hg commit -m remote-change | |
19 | $ cd .. |
|
19 | $ cd .. | |
20 |
|
20 | |||
21 | $ cd b |
|
21 | $ cd b | |
22 | $ mkdir testdir/subdir |
|
22 | $ mkdir testdir/subdir | |
23 | $ hg mv testdir/a testdir/subdir/a |
|
23 | $ hg mv testdir/a testdir/subdir/a | |
24 |
$ hg commit - |
|
24 | $ hg commit -m move | |
25 | $ mkdir newdir |
|
25 | $ mkdir newdir | |
26 | $ echo beta > newdir/beta |
|
26 | $ echo beta > newdir/beta | |
27 | $ hg add newdir/beta |
|
27 | $ hg add newdir/beta | |
28 |
$ hg commit - |
|
28 | $ hg commit -m local-addition | |
29 | $ hg pull ../a |
|
29 | $ hg pull ../a | |
30 | pulling from ../a |
|
30 | pulling from ../a | |
31 | searching for changes |
|
31 | searching for changes | |
@@ -43,7 +43,7 b' but then local changes are added in the ' | |||||
43 | $ hg stat |
|
43 | $ hg stat | |
44 | M testdir/subdir/a |
|
44 | M testdir/subdir/a | |
45 | $ hg diff --nodates |
|
45 | $ hg diff --nodates | |
46 |
diff -r |
|
46 | diff -r bc21c9773bfa testdir/subdir/a | |
47 | --- a/testdir/subdir/a |
|
47 | --- a/testdir/subdir/a | |
48 | +++ b/testdir/subdir/a |
|
48 | +++ b/testdir/subdir/a | |
49 | @@ -1,1 +1,1 @@ |
|
49 | @@ -1,1 +1,1 @@ |
@@ -3,16 +3,16 b'' | |||||
3 | $ hg init |
|
3 | $ hg init | |
4 | $ echo This is file a1 > a |
|
4 | $ echo This is file a1 > a | |
5 | $ hg add a |
|
5 | $ hg add a | |
6 |
$ hg commit -m "commit #0" |
|
6 | $ hg commit -m "commit #0" | |
7 | $ echo This is file b1 > b |
|
7 | $ echo This is file b1 > b | |
8 | $ hg add b |
|
8 | $ hg add b | |
9 |
$ hg commit -m "commit #1" |
|
9 | $ hg commit -m "commit #1" | |
10 | $ rm b |
|
10 | $ rm b | |
11 | $ hg update 0 |
|
11 | $ hg update 0 | |
12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | $ echo This is file b2 > b |
|
13 | $ echo This is file b2 > b | |
14 | $ hg add b |
|
14 | $ hg add b | |
15 |
$ hg commit -m "commit #2" |
|
15 | $ hg commit -m "commit #2" | |
16 | created new head |
|
16 | created new head | |
17 | $ cd ..; rm -r t |
|
17 | $ cd ..; rm -r t | |
18 |
|
18 | |||
@@ -21,15 +21,15 b'' | |||||
21 | $ hg init |
|
21 | $ hg init | |
22 | $ echo This is file a1 > a |
|
22 | $ echo This is file a1 > a | |
23 | $ hg add a |
|
23 | $ hg add a | |
24 |
$ hg commit -m "commit #0" |
|
24 | $ hg commit -m "commit #0" | |
25 | $ echo This is file b1 > b |
|
25 | $ echo This is file b1 > b | |
26 | $ hg add b |
|
26 | $ hg add b | |
27 |
$ hg commit -m "commit #1" |
|
27 | $ hg commit -m "commit #1" | |
28 | $ rm b |
|
28 | $ rm b | |
29 | $ hg update 0 |
|
29 | $ hg update 0 | |
30 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | $ echo This is file b2 > b |
|
31 | $ echo This is file b2 > b | |
32 |
$ hg commit -A -m "commit #2" |
|
32 | $ hg commit -A -m "commit #2" | |
33 | adding b |
|
33 | adding b | |
34 | created new head |
|
34 | created new head | |
35 | $ cd ..; rm -r t |
|
35 | $ cd ..; rm -r t | |
@@ -39,15 +39,15 b'' | |||||
39 | $ hg init |
|
39 | $ hg init | |
40 | $ echo This is file a1 > a |
|
40 | $ echo This is file a1 > a | |
41 | $ hg add a |
|
41 | $ hg add a | |
42 |
$ hg commit -m "commit #0" |
|
42 | $ hg commit -m "commit #0" | |
43 | $ echo This is file b1 > b |
|
43 | $ echo This is file b1 > b | |
44 | $ hg add b |
|
44 | $ hg add b | |
45 |
$ hg commit -m "commit #1" |
|
45 | $ hg commit -m "commit #1" | |
46 | $ rm b |
|
46 | $ rm b | |
47 | $ hg remove b |
|
47 | $ hg remove b | |
48 | $ hg update 0 |
|
48 | $ hg update 0 | |
49 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | $ echo This is file b2 > b |
|
50 | $ echo This is file b2 > b | |
51 |
$ hg commit -A -m "commit #2" |
|
51 | $ hg commit -A -m "commit #2" | |
52 | adding b |
|
52 | adding b | |
53 | created new head |
|
53 | created new head |
@@ -1,20 +1,20 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ echo This is file a1 > a |
|
2 | $ echo This is file a1 > a | |
3 | $ hg add a |
|
3 | $ hg add a | |
4 |
$ hg commit -m "commit #0" |
|
4 | $ hg commit -m "commit #0" | |
5 | $ echo This is file b1 > b |
|
5 | $ echo This is file b1 > b | |
6 | $ hg add b |
|
6 | $ hg add b | |
7 |
$ hg commit -m "commit #1" |
|
7 | $ hg commit -m "commit #1" | |
8 | $ hg update 0 |
|
8 | $ hg update 0 | |
9 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
9 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
10 | $ echo This is file c1 > c |
|
10 | $ echo This is file c1 > c | |
11 | $ hg add c |
|
11 | $ hg add c | |
12 |
$ hg commit -m "commit #2" |
|
12 | $ hg commit -m "commit #2" | |
13 | created new head |
|
13 | created new head | |
14 | $ hg merge 1 |
|
14 | $ hg merge 1 | |
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
16 | (branch merge, don't forget to commit) |
|
16 | (branch merge, don't forget to commit) | |
17 | $ rm b |
|
17 | $ rm b | |
18 | $ echo This is file c22 > c |
|
18 | $ echo This is file c22 > c | |
19 |
$ hg commit -m "commit #3" |
|
19 | $ hg commit -m "commit #3" | |
20 |
|
20 |
@@ -10,7 +10,7 b'' | |||||
10 | $ echo This is file foo1 > foo |
|
10 | $ echo This is file foo1 > foo | |
11 | $ echo This is file bar1 > bar |
|
11 | $ echo This is file bar1 > bar | |
12 | $ hg add foo bar |
|
12 | $ hg add foo bar | |
13 |
$ hg commit -m "commit text" |
|
13 | $ hg commit -m "commit text" | |
14 |
|
14 | |||
15 | $ cd .. |
|
15 | $ cd .. | |
16 | $ hg clone A1 B1 |
|
16 | $ hg clone A1 B1 | |
@@ -20,11 +20,11 b'' | |||||
20 | $ cd A1 |
|
20 | $ cd A1 | |
21 | $ rm bar |
|
21 | $ rm bar | |
22 | $ hg remove bar |
|
22 | $ hg remove bar | |
23 |
$ hg commit -m "commit test" |
|
23 | $ hg commit -m "commit test" | |
24 |
|
24 | |||
25 | $ cd ../B1 |
|
25 | $ cd ../B1 | |
26 | $ echo This is file foo22 > foo |
|
26 | $ echo This is file foo22 > foo | |
27 |
$ hg commit -m "commit test" |
|
27 | $ hg commit -m "commit test" | |
28 |
|
28 | |||
29 | $ cd .. |
|
29 | $ cd .. | |
30 | $ hg clone A1 A2 |
|
30 | $ hg clone A1 A2 | |
@@ -46,7 +46,7 b'' | |||||
46 | $ hg merge |
|
46 | $ hg merge | |
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | (branch merge, don't forget to commit) |
|
48 | (branch merge, don't forget to commit) | |
49 |
$ hg commit -m "commit test" |
|
49 | $ hg commit -m "commit test" | |
50 | bar should remain deleted. |
|
50 | bar should remain deleted. | |
51 | $ hg manifest --debug |
|
51 | $ hg manifest --debug | |
52 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|
52 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo | |
@@ -63,7 +63,7 b' bar should remain deleted.' | |||||
63 | $ hg merge |
|
63 | $ hg merge | |
64 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
64 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
65 | (branch merge, don't forget to commit) |
|
65 | (branch merge, don't forget to commit) | |
66 |
$ hg commit -m "commit test" |
|
66 | $ hg commit -m "commit test" | |
67 | bar should remain deleted. |
|
67 | bar should remain deleted. | |
68 | $ hg manifest --debug |
|
68 | $ hg manifest --debug | |
69 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|
69 | f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
@@ -7,7 +7,7 b' initial' | |||||
7 | > 3 |
|
7 | > 3 | |
8 | > EOF |
|
8 | > EOF | |
9 | $ hg add test.txt |
|
9 | $ hg add test.txt | |
10 |
$ hg commit -m "Initial" |
|
10 | $ hg commit -m "Initial" | |
11 |
|
11 | |||
12 | clone |
|
12 | clone | |
13 | $ cd .. |
|
13 | $ cd .. | |
@@ -22,7 +22,7 b' change test-a' | |||||
22 | > two |
|
22 | > two | |
23 | > three |
|
23 | > three | |
24 | > EOF |
|
24 | > EOF | |
25 |
$ hg commit -m "Numbers as words" |
|
25 | $ hg commit -m "Numbers as words" | |
26 |
|
26 | |||
27 | change test-b |
|
27 | change test-b | |
28 | $ cd ../test-b |
|
28 | $ cd ../test-b | |
@@ -31,7 +31,7 b' change test-b' | |||||
31 | > 2.5 |
|
31 | > 2.5 | |
32 | > 3 |
|
32 | > 3 | |
33 | > EOF |
|
33 | > EOF | |
34 |
$ hg commit -m "2 -> 2.5" |
|
34 | $ hg commit -m "2 -> 2.5" | |
35 |
|
35 | |||
36 | now pull and merge from test-a |
|
36 | now pull and merge from test-a | |
37 | $ hg pull ../test-a |
|
37 | $ hg pull ../test-a | |
@@ -56,7 +56,7 b' resolve conflict' | |||||
56 | > EOF |
|
56 | > EOF | |
57 | $ rm -f *.orig |
|
57 | $ rm -f *.orig | |
58 | $ hg resolve -m test.txt |
|
58 | $ hg resolve -m test.txt | |
59 |
$ hg commit -m "Merge 1" |
|
59 | $ hg commit -m "Merge 1" | |
60 |
|
60 | |||
61 | change test-a again |
|
61 | change test-a again | |
62 | $ cd ../test-a |
|
62 | $ cd ../test-a | |
@@ -65,7 +65,7 b' change test-a again' | |||||
65 | > two-point-one |
|
65 | > two-point-one | |
66 | > three |
|
66 | > three | |
67 | > EOF |
|
67 | > EOF | |
68 |
$ hg commit -m "two -> two-point-one" |
|
68 | $ hg commit -m "two -> two-point-one" | |
69 |
|
69 | |||
70 | pull and merge from test-a again |
|
70 | pull and merge from test-a again | |
71 | $ cd ../test-b |
|
71 | $ cd ../test-b | |
@@ -81,13 +81,13 b' pull and merge from test-a again' | |||||
81 | searching for copies back to rev 1 |
|
81 | searching for copies back to rev 1 | |
82 | resolving manifests |
|
82 | resolving manifests | |
83 | overwrite None partial False |
|
83 | overwrite None partial False | |
84 | ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
|
84 | ancestor 96b70246a118 local 50c3a7e29886+ remote 40d11a4173a8 | |
85 | test.txt: versions differ -> m |
|
85 | test.txt: versions differ -> m | |
86 | preserving test.txt for resolve of test.txt |
|
86 | preserving test.txt for resolve of test.txt | |
87 | updating: test.txt 1/1 files (100.00%) |
|
87 | updating: test.txt 1/1 files (100.00%) | |
88 | picked tool 'internal:merge' for test.txt (binary False symlink False) |
|
88 | picked tool 'internal:merge' for test.txt (binary False symlink False) | |
89 | merging test.txt |
|
89 | merging test.txt | |
90 |
my test.txt@ |
|
90 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | |
91 | warning: conflicts during merge. |
|
91 | warning: conflicts during merge. | |
92 | merging test.txt failed! |
|
92 | merging test.txt failed! | |
93 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
93 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
@@ -111,33 +111,33 b' pull and merge from test-a again' | |||||
111 | 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 |
|
111 | 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 | |
112 |
|
112 | |||
113 | $ hg log |
|
113 | $ hg log | |
114 |
changeset: 4: |
|
114 | changeset: 4:40d11a4173a8 | |
115 | tag: tip |
|
115 | tag: tip | |
116 |
parent: 2: |
|
116 | parent: 2:96b70246a118 | |
117 | user: test |
|
117 | user: test | |
118 |
date: |
|
118 | date: Thu Jan 01 00:00:00 1970 +0000 | |
119 | summary: two -> two-point-one |
|
119 | summary: two -> two-point-one | |
120 |
|
120 | |||
121 |
changeset: 3: |
|
121 | changeset: 3:50c3a7e29886 | |
122 |
parent: 1: |
|
122 | parent: 1:d1e159716d41 | |
123 |
parent: 2: |
|
123 | parent: 2:96b70246a118 | |
124 | user: test |
|
124 | user: test | |
125 |
date: |
|
125 | date: Thu Jan 01 00:00:00 1970 +0000 | |
126 | summary: Merge 1 |
|
126 | summary: Merge 1 | |
127 |
|
127 | |||
128 |
changeset: 2: |
|
128 | changeset: 2:96b70246a118 | |
129 |
parent: 0: |
|
129 | parent: 0:b1832b9d912a | |
130 | user: test |
|
130 | user: test | |
131 |
date: |
|
131 | date: Thu Jan 01 00:00:00 1970 +0000 | |
132 | summary: Numbers as words |
|
132 | summary: Numbers as words | |
133 |
|
133 | |||
134 |
changeset: 1: |
|
134 | changeset: 1:d1e159716d41 | |
135 | user: test |
|
135 | user: test | |
136 |
date: |
|
136 | date: Thu Jan 01 00:00:00 1970 +0000 | |
137 | summary: 2 -> 2.5 |
|
137 | summary: 2 -> 2.5 | |
138 |
|
138 | |||
139 |
changeset: 0: |
|
139 | changeset: 0:b1832b9d912a | |
140 | user: test |
|
140 | user: test | |
141 |
date: |
|
141 | date: Thu Jan 01 00:00:00 1970 +0000 | |
142 | summary: Initial |
|
142 | summary: Initial | |
143 |
|
143 |
@@ -46,17 +46,17 b' some regular revisions' | |||||
46 | $ echo foo > foo |
|
46 | $ echo foo > foo | |
47 | $ hg add foo |
|
47 | $ hg add foo | |
48 | $ echo foo > .hg/branch |
|
48 | $ echo foo > .hg/branch | |
49 |
$ hg ci -m 'branch foo' |
|
49 | $ hg ci -m 'branch foo' | |
50 |
|
50 | |||
51 | $ echo bar > bar |
|
51 | $ echo bar > bar | |
52 | $ hg add bar |
|
52 | $ hg add bar | |
53 | $ echo bar > .hg/branch |
|
53 | $ echo bar > .hg/branch | |
54 |
$ hg ci -m 'branch bar' |
|
54 | $ hg ci -m 'branch bar' | |
55 | $ show_branch_cache |
|
55 | $ show_branch_cache | |
56 | tip: 1 |
|
56 | tip: 1 | |
57 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
57 | c229711f16da3d7591f89b1b8d963b79bda22714 1 | |
58 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
58 | c229711f16da3d7591f89b1b8d963b79bda22714 bar | |
59 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
59 | dc25e3827021582e979f600811852e36cbe57341 foo | |
60 |
|
60 | |||
61 | add some mq patches |
|
61 | add some mq patches | |
62 |
|
62 | |||
@@ -65,9 +65,9 b' add some mq patches' | |||||
65 | now at: p1 |
|
65 | now at: p1 | |
66 | $ show_branch_cache |
|
66 | $ show_branch_cache | |
67 | tip: 2 |
|
67 | tip: 2 | |
68 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
68 | c229711f16da3d7591f89b1b8d963b79bda22714 1 | |
69 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
69 | c229711f16da3d7591f89b1b8d963b79bda22714 bar | |
70 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
70 | dc25e3827021582e979f600811852e36cbe57341 foo | |
71 |
|
71 | |||
72 | $ hg qnew p2 |
|
72 | $ hg qnew p2 | |
73 | $ echo foo > .hg/branch |
|
73 | $ echo foo > .hg/branch | |
@@ -75,9 +75,9 b' add some mq patches' | |||||
75 | $ hg qrefresh -m 'patch 2' |
|
75 | $ hg qrefresh -m 'patch 2' | |
76 | $ show_branch_cache 1 |
|
76 | $ show_branch_cache 1 | |
77 | tip: 3 |
|
77 | tip: 3 | |
78 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
78 | c229711f16da3d7591f89b1b8d963b79bda22714 1 | |
79 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
79 | c229711f16da3d7591f89b1b8d963b79bda22714 bar | |
80 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
80 | dc25e3827021582e979f600811852e36cbe57341 foo | |
81 | branch foo: 3 |
|
81 | branch foo: 3 | |
82 | branch bar: 2 |
|
82 | branch bar: 2 | |
83 |
|
83 | |||
@@ -86,9 +86,9 b' removing the cache' | |||||
86 | $ rm $branches |
|
86 | $ rm $branches | |
87 | $ show_branch_cache 1 |
|
87 | $ show_branch_cache 1 | |
88 | tip: 3 |
|
88 | tip: 3 | |
89 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
89 | c229711f16da3d7591f89b1b8d963b79bda22714 1 | |
90 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
90 | c229711f16da3d7591f89b1b8d963b79bda22714 bar | |
91 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
91 | dc25e3827021582e979f600811852e36cbe57341 foo | |
92 | branch foo: 3 |
|
92 | branch foo: 3 | |
93 | branch bar: 2 |
|
93 | branch bar: 2 | |
94 |
|
94 | |||
@@ -97,9 +97,9 b' importing rev 1 (the cache now ends in o' | |||||
97 | $ hg qimport -r 1 -n p0 |
|
97 | $ hg qimport -r 1 -n p0 | |
98 | $ show_branch_cache 1 |
|
98 | $ show_branch_cache 1 | |
99 | tip: 3 |
|
99 | tip: 3 | |
100 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
100 | c229711f16da3d7591f89b1b8d963b79bda22714 1 | |
101 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
101 | c229711f16da3d7591f89b1b8d963b79bda22714 bar | |
102 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
102 | dc25e3827021582e979f600811852e36cbe57341 foo | |
103 | branch foo: 3 |
|
103 | branch foo: 3 | |
104 | branch bar: 2 |
|
104 | branch bar: 2 | |
105 | $ hg log -r qbase --template 'qbase: {rev}\n' |
|
105 | $ hg log -r qbase --template 'qbase: {rev}\n' | |
@@ -119,6 +119,6 b' detect an invalid cache' | |||||
119 | now at: p2 |
|
119 | now at: p2 | |
120 | $ show_branch_cache |
|
120 | $ show_branch_cache | |
121 | tip: 3 |
|
121 | tip: 3 | |
122 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 |
|
122 | dc25e3827021582e979f600811852e36cbe57341 0 | |
123 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
123 | dc25e3827021582e979f600811852e36cbe57341 foo | |
124 |
|
124 |
@@ -8,16 +8,16 b' hg branches' | |||||
8 |
|
8 | |||
9 | echo foo > a |
|
9 | echo foo > a | |
10 | hg add a |
|
10 | hg add a | |
11 |
hg ci -m "initial" |
|
11 | hg ci -m "initial" | |
12 | hg branch foo |
|
12 | hg branch foo | |
13 | hg branch |
|
13 | hg branch | |
14 |
hg ci -m "add branch name" |
|
14 | hg ci -m "add branch name" | |
15 | hg branch bar |
|
15 | hg branch bar | |
16 |
hg ci -m "change branch name" |
|
16 | hg ci -m "change branch name" | |
17 | echo % branch shadowing |
|
17 | echo % branch shadowing | |
18 | hg branch default |
|
18 | hg branch default | |
19 | hg branch -f default |
|
19 | hg branch -f default | |
20 |
hg ci -m "clear branch name" |
|
20 | hg ci -m "clear branch name" | |
21 |
|
21 | |||
22 | echo % there should be only one default branch head |
|
22 | echo % there should be only one default branch head | |
23 | hg heads . |
|
23 | hg heads . | |
@@ -25,11 +25,11 b' hg heads .' | |||||
25 | hg co foo |
|
25 | hg co foo | |
26 | hg branch |
|
26 | hg branch | |
27 | echo bleah > a |
|
27 | echo bleah > a | |
28 |
hg ci -m "modify a branch" |
|
28 | hg ci -m "modify a branch" | |
29 |
|
29 | |||
30 | hg merge default |
|
30 | hg merge default | |
31 | hg branch |
|
31 | hg branch | |
32 |
hg ci -m "merge" |
|
32 | hg ci -m "merge" | |
33 | hg log |
|
33 | hg log | |
34 |
|
34 | |||
35 | hg branches |
|
35 | hg branches | |
@@ -68,11 +68,11 b' hg up' | |||||
68 | echo % fastforward merge |
|
68 | echo % fastforward merge | |
69 | hg branch ff |
|
69 | hg branch ff | |
70 | echo ff > ff |
|
70 | echo ff > ff | |
71 |
hg ci -Am'fast forward' |
|
71 | hg ci -Am'fast forward' | |
72 | hg up foo |
|
72 | hg up foo | |
73 | hg merge ff |
|
73 | hg merge ff | |
74 | hg branch |
|
74 | hg branch | |
75 |
hg commit -m'Merge ff into foo' |
|
75 | hg commit -m'Merge ff into foo' | |
76 | hg parents |
|
76 | hg parents | |
77 | hg manifest |
|
77 | hg manifest | |
78 |
|
78 |
@@ -6,10 +6,10 b' abort: a branch of the same name already' | |||||
6 | marked working directory as branch default |
|
6 | marked working directory as branch default | |
7 | created new head |
|
7 | created new head | |
8 | % there should be only one default branch head |
|
8 | % there should be only one default branch head | |
9 |
changeset: 3: |
|
9 | changeset: 3:9d567d0b51f9 | |
10 | tag: tip |
|
10 | tag: tip | |
11 | user: test |
|
11 | user: test | |
12 |
date: |
|
12 | date: Thu Jan 01 00:00:00 1970 +0000 | |
13 | summary: clear branch name |
|
13 | summary: clear branch name | |
14 |
|
14 | |||
15 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -17,92 +17,92 b' foo' | |||||
17 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | (branch merge, don't forget to commit) |
|
18 | (branch merge, don't forget to commit) | |
19 | foo |
|
19 | foo | |
20 |
changeset: 5: |
|
20 | changeset: 5:dc140083783b | |
21 | branch: foo |
|
21 | branch: foo | |
22 | tag: tip |
|
22 | tag: tip | |
23 |
parent: 4: |
|
23 | parent: 4:98d14f698afe | |
24 |
parent: 3: |
|
24 | parent: 3:9d567d0b51f9 | |
25 | user: test |
|
25 | user: test | |
26 |
date: |
|
26 | date: Thu Jan 01 00:00:00 1970 +0000 | |
27 | summary: merge |
|
27 | summary: merge | |
28 |
|
28 | |||
29 |
changeset: 4: |
|
29 | changeset: 4:98d14f698afe | |
30 | branch: foo |
|
30 | branch: foo | |
31 |
parent: 1: |
|
31 | parent: 1:0079f24813e2 | |
32 | user: test |
|
32 | user: test | |
33 |
date: |
|
33 | date: Thu Jan 01 00:00:00 1970 +0000 | |
34 | summary: modify a branch |
|
34 | summary: modify a branch | |
35 |
|
35 | |||
36 |
changeset: 3: |
|
36 | changeset: 3:9d567d0b51f9 | |
37 | user: test |
|
37 | user: test | |
38 |
date: |
|
38 | date: Thu Jan 01 00:00:00 1970 +0000 | |
39 | summary: clear branch name |
|
39 | summary: clear branch name | |
40 |
|
40 | |||
41 |
changeset: 2: |
|
41 | changeset: 2:ed2bbf4e0102 | |
42 | branch: bar |
|
42 | branch: bar | |
43 | user: test |
|
43 | user: test | |
44 |
date: |
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 | |
45 | summary: change branch name |
|
45 | summary: change branch name | |
46 |
|
46 | |||
47 |
changeset: 1: |
|
47 | changeset: 1:0079f24813e2 | |
48 | branch: foo |
|
48 | branch: foo | |
49 | user: test |
|
49 | user: test | |
50 |
date: |
|
50 | date: Thu Jan 01 00:00:00 1970 +0000 | |
51 | summary: add branch name |
|
51 | summary: add branch name | |
52 |
|
52 | |||
53 |
changeset: 0: |
|
53 | changeset: 0:db01e8ea3388 | |
54 | user: test |
|
54 | user: test | |
55 |
date: |
|
55 | date: Thu Jan 01 00:00:00 1970 +0000 | |
56 | summary: initial |
|
56 | summary: initial | |
57 |
|
57 | |||
58 |
foo 5: |
|
58 | foo 5:dc140083783b | |
59 |
default 3: |
|
59 | default 3:9d567d0b51f9 (inactive) | |
60 |
bar 2: |
|
60 | bar 2:ed2bbf4e0102 (inactive) | |
61 | foo |
|
61 | foo | |
62 | default |
|
62 | default | |
63 | bar |
|
63 | bar | |
64 | % test for invalid branch cache |
|
64 | % test for invalid branch cache | |
65 | rolling back to revision 4 (undo commit) |
|
65 | rolling back to revision 4 (undo commit) | |
66 |
changeset: 4: |
|
66 | changeset: 4:98d14f698afe | |
67 | branch: foo |
|
67 | branch: foo | |
68 | tag: tip |
|
68 | tag: tip | |
69 |
parent: 1: |
|
69 | parent: 1:0079f24813e2 | |
70 | user: test |
|
70 | user: test | |
71 |
date: |
|
71 | date: Thu Jan 01 00:00:00 1970 +0000 | |
72 | summary: modify a branch |
|
72 | summary: modify a branch | |
73 |
|
73 | |||
74 | invalidating branch cache (tip differs) |
|
74 | invalidating branch cache (tip differs) | |
75 | changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f |
|
75 | changeset: 4:98d14f698afeaff8cb612dcf215ce95e639effc3 | |
76 | branch: foo |
|
76 | branch: foo | |
77 | tag: tip |
|
77 | tag: tip | |
78 | parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31 |
|
78 | parent: 1:0079f24813e2b73a891577c243684c5066347bc8 | |
79 | parent: -1:0000000000000000000000000000000000000000 |
|
79 | parent: -1:0000000000000000000000000000000000000000 | |
80 | manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a |
|
80 | manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a | |
81 | user: test |
|
81 | user: test | |
82 |
date: |
|
82 | date: Thu Jan 01 00:00:00 1970 +0000 | |
83 | files: a |
|
83 | files: a | |
84 | extra: branch=foo |
|
84 | extra: branch=foo | |
85 | description: |
|
85 | description: | |
86 | modify a branch |
|
86 | modify a branch | |
87 |
|
87 | |||
88 |
|
88 | |||
89 | 4:4909a3732169 |
|
89 | 4:98d14f698afe | |
90 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
|
90 | 98d14f698afeaff8cb612dcf215ce95e639effc3 4 | |
91 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default |
|
91 | 9d567d0b51f9e2068b054e1948e1a927f99b5874 default | |
92 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
|
92 | 98d14f698afeaff8cb612dcf215ce95e639effc3 foo | |
93 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
|
93 | ed2bbf4e01029020711be82ca905283e883f0e11 bar | |
94 | % push should update the branch cache |
|
94 | % push should update the branch cache | |
95 | % pushing just rev 0 |
|
95 | % pushing just rev 0 | |
96 | be8523e69bf892e25817fc97187516b3c0804ae4 0 |
|
96 | db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0 | |
97 | be8523e69bf892e25817fc97187516b3c0804ae4 default |
|
97 | db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default | |
98 | % pushing everything |
|
98 | % pushing everything | |
99 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
|
99 | 98d14f698afeaff8cb612dcf215ce95e639effc3 4 | |
100 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default |
|
100 | 9d567d0b51f9e2068b054e1948e1a927f99b5874 default | |
101 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
|
101 | 98d14f698afeaff8cb612dcf215ce95e639effc3 foo | |
102 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
|
102 | ed2bbf4e01029020711be82ca905283e883f0e11 bar | |
103 | % update with no arguments: tipmost revision of the current branch |
|
103 | % update with no arguments: tipmost revision of the current branch | |
104 | bf1bc2f45e83 |
|
104 | 9d567d0b51f9 | |
105 | 4909a3732169 (foo) tip |
|
105 | 98d14f698afe (foo) tip | |
106 | marked working directory as branch foobar |
|
106 | marked working directory as branch foobar | |
107 | abort: branch foobar not found |
|
107 | abort: branch foobar not found | |
108 | % fastforward merge |
|
108 | % fastforward merge | |
@@ -112,13 +112,13 b' 0 files updated, 0 files merged, 1 files' | |||||
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
113 | (branch merge, don't forget to commit) |
|
113 | (branch merge, don't forget to commit) | |
114 | foo |
|
114 | foo | |
115 |
changeset: 6: |
|
115 | changeset: 6:917eb54e1b4b | |
116 | branch: foo |
|
116 | branch: foo | |
117 | tag: tip |
|
117 | tag: tip | |
118 |
parent: 4: |
|
118 | parent: 4:98d14f698afe | |
119 |
parent: 5: |
|
119 | parent: 5:6683a60370cb | |
120 | user: test |
|
120 | user: test | |
121 |
date: |
|
121 | date: Thu Jan 01 00:00:00 1970 +0000 | |
122 | summary: Merge ff into foo |
|
122 | summary: Merge ff into foo | |
123 |
|
123 | |||
124 | a |
|
124 | a |
@@ -14,10 +14,10 b' hg init a' | |||||
14 | cd a |
|
14 | cd a | |
15 | echo abc > foo |
|
15 | echo abc > foo | |
16 | hg add foo |
|
16 | hg add foo | |
17 |
hg commit -m 'add foo' |
|
17 | hg commit -m 'add foo' | |
18 |
|
18 | |||
19 | echo >> foo |
|
19 | echo >> foo | |
20 |
hg commit -m 'change foo' |
|
20 | hg commit -m 'change foo' | |
21 | hg log -r 0: |
|
21 | hg log -r 0: | |
22 |
|
22 | |||
23 | cat >> test.py << EOF |
|
23 | cat >> test.py << EOF |
@@ -1,14 +1,14 b'' | |||||
1 |
changeset: 0: |
|
1 | changeset: 0:7c31755bf9b5 | |
2 | user: test |
|
2 | user: test | |
3 |
date: |
|
3 | date: Thu Jan 01 00:00:00 1970 +0000 | |
4 | summary: add foo |
|
4 | summary: add foo | |
5 |
|
5 | |||
6 |
changeset: 1: |
|
6 | changeset: 1:26333235a41c | |
7 | tag: tip |
|
7 | tag: tip | |
8 | user: test |
|
8 | user: test | |
9 |
date: |
|
9 | date: Thu Jan 01 00:00:00 1970 +0000 | |
10 | summary: change foo |
|
10 | summary: change foo | |
11 |
|
11 | |||
12 | 2 revisions: |
|
12 | 2 revisions: | |
13 | 9c2cf2b35aa7 |
|
13 | 7c31755bf9b5 | |
14 | 3756a9556b89 |
|
14 | 26333235a41c |
@@ -7,7 +7,7 b' echo foo > a' | |||||
7 | echo '% hg add a' |
|
7 | echo '% hg add a' | |
8 | hg add a |
|
8 | hg add a | |
9 | echo '% hg commit' |
|
9 | echo '% hg commit' | |
10 |
hg commit -m "1" |
|
10 | hg commit -m "1" | |
11 | echo '% hg verify' |
|
11 | echo '% hg verify' | |
12 | hg verify |
|
12 | hg verify | |
13 | chmod -r .hg/store/data/a.i |
|
13 | chmod -r .hg/store/data/a.i | |
@@ -19,7 +19,7 b' hg verify 2>/dev/null || echo verify fai' | |||||
19 | chmod -w .hg/store/data/a.i |
|
19 | chmod -w .hg/store/data/a.i | |
20 | echo barber > a |
|
20 | echo barber > a | |
21 | echo '% hg commit' |
|
21 | echo '% hg commit' | |
22 |
hg commit -m "2" |
|
22 | hg commit -m "2" 2>/dev/null || echo commit failed | |
23 | chmod -w . |
|
23 | chmod -w . | |
24 | echo '% hg diff' |
|
24 | echo '% hg diff' | |
25 | hg diff --nodates |
|
25 | hg diff --nodates |
@@ -22,7 +22,7 b' 1 files, 1 changesets, 1 total revisions' | |||||
22 | % hg commit |
|
22 | % hg commit | |
23 | commit failed |
|
23 | commit failed | |
24 | % hg diff |
|
24 | % hg diff | |
25 | diff -r c1fab96507ef a |
|
25 | diff -r 2a18120dc1c9 a | |
26 | --- a/a |
|
26 | --- a/a | |
27 | +++ b/a |
|
27 | +++ b/a | |
28 | @@ -1,1 +1,1 @@ |
|
28 | @@ -1,1 +1,1 @@ |
@@ -5,7 +5,7 b' cd a' | |||||
5 | hg init |
|
5 | hg init | |
6 | echo foo > b |
|
6 | echo foo > b | |
7 | hg add b |
|
7 | hg add b | |
8 |
hg ci -m "b" |
|
8 | hg ci -m "b" | |
9 |
|
9 | |||
10 | chmod -w .hg/store |
|
10 | chmod -w .hg/store | |
11 |
|
11 |
@@ -8,7 +8,7 b' cd a' | |||||
8 | hg init |
|
8 | hg init | |
9 | echo foo > t1 |
|
9 | echo foo > t1 | |
10 | hg add t1 |
|
10 | hg add t1 | |
11 |
hg commit -m "1" |
|
11 | hg commit -m "1" | |
12 |
|
12 | |||
13 | cd .. |
|
13 | cd .. | |
14 | hg clone a b |
|
14 | hg clone a b | |
@@ -16,18 +16,18 b' hg clone a b' | |||||
16 | cd a |
|
16 | cd a | |
17 | echo foo > t2 |
|
17 | echo foo > t2 | |
18 | hg add t2 |
|
18 | hg add t2 | |
19 |
hg commit -m "2" |
|
19 | hg commit -m "2" | |
20 |
|
20 | |||
21 | cd ../b |
|
21 | cd ../b | |
22 | echo foo > t3 |
|
22 | echo foo > t3 | |
23 | hg add t3 |
|
23 | hg add t3 | |
24 |
hg commit -m "3" |
|
24 | hg commit -m "3" | |
25 |
|
25 | |||
26 | hg push ../a |
|
26 | hg push ../a | |
27 | hg pull ../a |
|
27 | hg pull ../a | |
28 | hg push ../a |
|
28 | hg push ../a | |
29 | hg merge |
|
29 | hg merge | |
30 |
hg commit -m "4" |
|
30 | hg commit -m "4" | |
31 | hg push ../a |
|
31 | hg push ../a | |
32 | cd .. |
|
32 | cd .. | |
33 |
|
33 | |||
@@ -35,7 +35,7 b' hg init c' | |||||
35 | cd c |
|
35 | cd c | |
36 | for i in 0 1 2; do |
|
36 | for i in 0 1 2; do | |
37 | echo $i >> foo |
|
37 | echo $i >> foo | |
38 |
hg ci -Am $i |
|
38 | hg ci -Am $i | |
39 | done |
|
39 | done | |
40 | cd .. |
|
40 | cd .. | |
41 |
|
41 | |||
@@ -44,11 +44,11 b' cd d' | |||||
44 | for i in 0 1; do |
|
44 | for i in 0 1; do | |
45 | hg co -C $i |
|
45 | hg co -C $i | |
46 | echo d-$i >> foo |
|
46 | echo d-$i >> foo | |
47 |
hg ci -m d-$i |
|
47 | hg ci -m d-$i | |
48 | done |
|
48 | done | |
49 |
|
49 | |||
50 | HGMERGE=true hg merge 3 |
|
50 | HGMERGE=true hg merge 3 | |
51 |
hg ci -m c-d |
|
51 | hg ci -m c-d | |
52 |
|
52 | |||
53 | hg push ../c; echo $? |
|
53 | hg push ../c; echo $? | |
54 | hg push -r 2 ../c; echo $? |
|
54 | hg push -r 2 ../c; echo $? | |
@@ -70,16 +70,16 b' hg init f' | |||||
70 | cd f |
|
70 | cd f | |
71 | hg -q branch a |
|
71 | hg -q branch a | |
72 | echo 0 > foo |
|
72 | echo 0 > foo | |
73 |
hg -q ci - |
|
73 | hg -q ci -Am 0 | |
74 | echo 1 > foo |
|
74 | echo 1 > foo | |
75 |
hg -q ci - |
|
75 | hg -q ci -m 1 | |
76 | hg -q up 0 |
|
76 | hg -q up 0 | |
77 | echo 2 > foo |
|
77 | echo 2 > foo | |
78 |
hg -q ci - |
|
78 | hg -q ci -m 2 | |
79 | hg -q up 0 |
|
79 | hg -q up 0 | |
80 | hg -q branch b |
|
80 | hg -q branch b | |
81 | echo 3 > foo |
|
81 | echo 3 > foo | |
82 |
hg -q ci - |
|
82 | hg -q ci -m 3 | |
83 | cd .. |
|
83 | cd .. | |
84 |
|
84 | |||
85 | hg -q clone f g |
|
85 | hg -q clone f g | |
@@ -88,18 +88,18 b' cd g' | |||||
88 | echo % push on existing branch and new branch |
|
88 | echo % push on existing branch and new branch | |
89 | hg -q up 1 |
|
89 | hg -q up 1 | |
90 | echo 4 > foo |
|
90 | echo 4 > foo | |
91 |
hg -q ci - |
|
91 | hg -q ci -m 4 | |
92 | hg -q up 0 |
|
92 | hg -q up 0 | |
93 | echo 5 > foo |
|
93 | echo 5 > foo | |
94 | hg -q branch c |
|
94 | hg -q branch c | |
95 |
hg -q ci - |
|
95 | hg -q ci -m 5 | |
96 | hg push ../f; echo $? |
|
96 | hg push ../f; echo $? | |
97 | hg push -r 4 -r 5 ../f; echo $? |
|
97 | hg push -r 4 -r 5 ../f; echo $? | |
98 |
|
98 | |||
99 | echo % multiple new branches |
|
99 | echo % multiple new branches | |
100 | hg -q branch d |
|
100 | hg -q branch d | |
101 | echo 6 > foo |
|
101 | echo 6 > foo | |
102 |
hg -q ci - |
|
102 | hg -q ci -m 6 | |
103 | hg push ../f; echo $? |
|
103 | hg push ../f; echo $? | |
104 | hg push -r 4 -r 6 ../f; echo $? |
|
104 | hg push -r 4 -r 6 ../f; echo $? | |
105 | cd ../g |
|
105 | cd ../g | |
@@ -107,41 +107,41 b' cd ../g' | |||||
107 | echo % fail on multiple head push |
|
107 | echo % fail on multiple head push | |
108 | hg -q up 1 |
|
108 | hg -q up 1 | |
109 | echo 7 > foo |
|
109 | echo 7 > foo | |
110 |
hg -q ci - |
|
110 | hg -q ci -m 7 | |
111 | hg push -r 4 -r 7 ../f; echo $? |
|
111 | hg push -r 4 -r 7 ../f; echo $? | |
112 |
|
112 | |||
113 | echo % push replacement head on existing branches |
|
113 | echo % push replacement head on existing branches | |
114 | hg -q up 3 |
|
114 | hg -q up 3 | |
115 | echo 8 > foo |
|
115 | echo 8 > foo | |
116 |
hg -q ci - |
|
116 | hg -q ci -m 8 | |
117 | hg push -r 7 -r 8 ../f; echo $? |
|
117 | hg push -r 7 -r 8 ../f; echo $? | |
118 |
|
118 | |||
119 | echo % merge of branch a to other branch b followed by unrelated push on branch a |
|
119 | echo % merge of branch a to other branch b followed by unrelated push on branch a | |
120 | hg -q up 7 |
|
120 | hg -q up 7 | |
121 | HGMERGE=true hg -q merge 8 |
|
121 | HGMERGE=true hg -q merge 8 | |
122 |
hg -q ci - |
|
122 | hg -q ci -m 9 | |
123 | hg -q up 8 |
|
123 | hg -q up 8 | |
124 | echo 10 > foo |
|
124 | echo 10 > foo | |
125 |
hg -q ci - |
|
125 | hg -q ci -m 10 | |
126 | hg push -r 9 ../f; echo $? |
|
126 | hg push -r 9 ../f; echo $? | |
127 | hg push -r 10 ../f; echo $? |
|
127 | hg push -r 10 ../f; echo $? | |
128 |
|
128 | |||
129 | echo % cheating the counting algorithm |
|
129 | echo % cheating the counting algorithm | |
130 | hg -q up 9 |
|
130 | hg -q up 9 | |
131 | HGMERGE=true hg -q merge 2 |
|
131 | HGMERGE=true hg -q merge 2 | |
132 |
hg -q ci - |
|
132 | hg -q ci -m 11 | |
133 | hg -q up 1 |
|
133 | hg -q up 1 | |
134 | echo 12 > foo |
|
134 | echo 12 > foo | |
135 |
hg -q ci - |
|
135 | hg -q ci -m 12 | |
136 | hg push -r 11 -r 12 ../f; echo $? |
|
136 | hg push -r 11 -r 12 ../f; echo $? | |
137 |
|
137 | |||
138 | echo % failed push of new named branch |
|
138 | echo % failed push of new named branch | |
139 | echo 12 > foo |
|
139 | echo 12 > foo | |
140 |
hg -q ci - |
|
140 | hg -q ci -m 12a | |
141 | hg -q up 11 |
|
141 | hg -q up 11 | |
142 | echo 13 > foo |
|
142 | echo 13 > foo | |
143 | hg -q branch e |
|
143 | hg -q branch e | |
144 |
hg -q ci - |
|
144 | hg -q ci -m 13d | |
145 | hg push -r 12 -r 13 ../f; echo $? |
|
145 | hg push -r 12 -r 13 ../f; echo $? | |
146 |
|
146 | |||
147 | echo % using --new-branch to push new named branch |
|
147 | echo % using --new-branch to push new named branch | |
@@ -187,26 +187,26 b' cd l' | |||||
187 | echo a >> foo |
|
187 | echo a >> foo | |
188 | hg -q add foo |
|
188 | hg -q add foo | |
189 | hg -q branch a |
|
189 | hg -q branch a | |
190 |
hg -q ci - |
|
190 | hg -q ci -ma | |
191 | hg -q up null |
|
191 | hg -q up null | |
192 | echo a >> foo |
|
192 | echo a >> foo | |
193 | hg -q add foo |
|
193 | hg -q add foo | |
194 | hg -q branch b |
|
194 | hg -q branch b | |
195 |
hg -q ci - |
|
195 | hg -q ci -mb | |
196 | cd .. |
|
196 | cd .. | |
197 | hg -q clone l m -u a |
|
197 | hg -q clone l m -u a | |
198 | cd m |
|
198 | cd m | |
199 | hg -q merge b |
|
199 | hg -q merge b | |
200 |
hg -q ci - |
|
200 | hg -q ci -mmb | |
201 | hg -q up 0 |
|
201 | hg -q up 0 | |
202 | echo a >> foo |
|
202 | echo a >> foo | |
203 | hg -q ci -ma2 |
|
203 | hg -q ci -ma2 | |
204 | hg -q up 2 |
|
204 | hg -q up 2 | |
205 | echo a >> foo |
|
205 | echo a >> foo | |
206 | hg -q branch -f b |
|
206 | hg -q branch -f b | |
207 |
hg -q ci - |
|
207 | hg -q ci -mb2 | |
208 | hg -q merge 3 |
|
208 | hg -q merge 3 | |
209 |
hg -q ci - |
|
209 | hg -q ci -mma | |
210 | hg push ../l -b b |
|
210 | hg push ../l -b b | |
211 | cd .. |
|
211 | cd .. | |
212 |
|
212 |
@@ -3,11 +3,11 b" test that 'hg commit' does not crash if " | |||||
3 | $ hg init |
|
3 | $ hg init | |
4 | $ echo This is file a1 > a |
|
4 | $ echo This is file a1 > a | |
5 | $ hg add a |
|
5 | $ hg add a | |
6 |
$ hg commit -m "commit #0" |
|
6 | $ hg commit -m "commit #0" | |
7 | $ touch b |
|
7 | $ touch b | |
8 | $ hg add b |
|
8 | $ hg add b | |
9 | $ rm b |
|
9 | $ rm b | |
10 |
$ hg commit -A -m"comment #1" |
|
10 | $ hg commit -A -m"comment #1" | |
11 | removing b |
|
11 | removing b | |
12 | nothing changed |
|
12 | nothing changed | |
13 | $ exit 0 |
|
13 | $ exit 0 |
@@ -6,13 +6,13 b'' | |||||
6 | $ echo d1/b > d1/b |
|
6 | $ echo d1/b > d1/b | |
7 | $ echo d2/b > d2/b |
|
7 | $ echo d2/b > d2/b | |
8 | $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b |
|
8 | $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b | |
9 |
$ hg commit -m "1" |
|
9 | $ hg commit -m "1" | |
10 |
|
10 | |||
11 | rename a single file |
|
11 | rename a single file | |
12 |
|
12 | |||
13 | $ hg rename d1/d11/a1 d2/c |
|
13 | $ hg rename d1/d11/a1 d2/c | |
14 | $ hg sum |
|
14 | $ hg sum | |
15 |
parent: 0: |
|
15 | parent: 0:9b4b6e7b2c26 tip | |
16 | 1 |
|
16 | 1 | |
17 | branch: default |
|
17 | branch: default | |
18 | commit: 1 renamed |
|
18 | commit: 1 renamed |
@@ -3,7 +3,7 b'' | |||||
3 | $ hg init |
|
3 | $ hg init | |
4 | $ echo a > a |
|
4 | $ echo a > a | |
5 | $ hg add a |
|
5 | $ hg add a | |
6 |
$ hg commit -m test |
|
6 | $ hg commit -m test | |
7 |
$ |
|
7 | $ rm .hg/requires | |
8 |
$ |
|
8 | $ hg tip | |
9 | abort: index 00changelog.i unknown format 2! |
|
9 | abort: index 00changelog.i unknown format 2! |
@@ -3,11 +3,11 b'' | |||||
3 |
|
3 | |||
4 | $ touch a |
|
4 | $ touch a | |
5 | $ hg add a |
|
5 | $ hg add a | |
6 |
$ hg ci -m "1" |
|
6 | $ hg ci -m "1" | |
7 |
|
7 | |||
8 | $ touch b |
|
8 | $ touch b | |
9 | $ hg add b |
|
9 | $ hg add b | |
10 |
$ hg ci -m "2" |
|
10 | $ hg ci -m "2" | |
11 |
|
11 | |||
12 | Should show unknown |
|
12 | Should show unknown | |
13 |
|
13 |
@@ -4,7 +4,7 b'' | |||||
4 | $ echo 123 > c |
|
4 | $ echo 123 > c | |
5 | $ echo 123 > e |
|
5 | $ echo 123 > e | |
6 | $ hg add a c e |
|
6 | $ hg add a c e | |
7 |
$ hg commit -m "first" |
|
7 | $ hg commit -m "first" a c e | |
8 | $ echo 123 > b |
|
8 | $ echo 123 > b | |
9 |
|
9 | |||
10 | should show b unknown |
|
10 | should show b unknown | |
@@ -102,11 +102,11 b' should say file not managed' | |||||
102 | should say file not found |
|
102 | should say file not found | |
103 |
|
103 | |||
104 | $ hg revert notfound |
|
104 | $ hg revert notfound | |
105 |
notfound: no such file in rev |
|
105 | notfound: no such file in rev 334a9e57682c | |
106 | $ touch d |
|
106 | $ touch d | |
107 | $ hg add d |
|
107 | $ hg add d | |
108 | $ hg rm a |
|
108 | $ hg rm a | |
109 |
$ hg commit -m "second" |
|
109 | $ hg commit -m "second" | |
110 | $ echo z > z |
|
110 | $ echo z > z | |
111 | $ hg add z |
|
111 | $ hg add z | |
112 | $ hg st |
|
112 | $ hg st | |
@@ -154,7 +154,7 b' should print non-executable' | |||||
154 | non-executable |
|
154 | non-executable | |
155 |
|
155 | |||
156 | $ chmod +x c |
|
156 | $ chmod +x c | |
157 |
$ hg commit - |
|
157 | $ hg commit -m exe | |
158 |
|
158 | |||
159 | $ chmod -x c |
|
159 | $ chmod -x c | |
160 | $ hg revert --all |
|
160 | $ hg revert --all | |
@@ -195,7 +195,7 b' should succeed' | |||||
195 |
|
195 | |||
196 | issue332 |
|
196 | issue332 | |
197 |
|
197 | |||
198 |
$ hg ci -A -m b |
|
198 | $ hg ci -A -m b | |
199 | adding b/b |
|
199 | adding b/b | |
200 | created new head |
|
200 | created new head | |
201 | $ echo foobar > b/b |
|
201 | $ echo foobar > b/b |
@@ -5,7 +5,7 b' cd t' | |||||
5 | hg init |
|
5 | hg init | |
6 | echo a > a |
|
6 | echo a > a | |
7 | hg add a |
|
7 | hg add a | |
8 |
hg commit -m "test" |
|
8 | hg commit -m "test" | |
9 | hg verify |
|
9 | hg verify | |
10 | hg parents |
|
10 | hg parents | |
11 | hg status |
|
11 | hg status |
@@ -3,10 +3,10 b' checking manifests' | |||||
3 | crosschecking files in changesets and manifests |
|
3 | crosschecking files in changesets and manifests | |
4 | checking files |
|
4 | checking files | |
5 | 1 files, 1 changesets, 1 total revisions |
|
5 | 1 files, 1 changesets, 1 total revisions | |
6 |
changeset: 0: |
|
6 | changeset: 0:acb14030fe0a | |
7 | tag: tip |
|
7 | tag: tip | |
8 | user: test |
|
8 | user: test | |
9 |
date: |
|
9 | date: Thu Jan 01 00:00:00 1970 +0000 | |
10 | summary: test |
|
10 | summary: test | |
11 |
|
11 | |||
12 | rolling back to revision -1 (undo commit) |
|
12 | rolling back to revision -1 (undo commit) |
@@ -37,7 +37,7 b' hg init remote' | |||||
37 | cd remote |
|
37 | cd remote | |
38 | echo this > foo |
|
38 | echo this > foo | |
39 | echo this > fooO |
|
39 | echo this > fooO | |
40 |
hg ci -A -m "init" |
|
40 | hg ci -A -m "init" foo fooO | |
41 | echo '[server]' > .hg/hgrc |
|
41 | echo '[server]' > .hg/hgrc | |
42 | echo 'uncompressed = True' >> .hg/hgrc |
|
42 | echo 'uncompressed = True' >> .hg/hgrc | |
43 | echo '[hooks]' >> .hg/hgrc |
|
43 | echo '[hooks]' >> .hg/hgrc | |
@@ -71,7 +71,7 b' hg pull -e "python ../dummyssh"' | |||||
71 |
|
71 | |||
72 | echo "# local change" |
|
72 | echo "# local change" | |
73 | echo bleah > foo |
|
73 | echo bleah > foo | |
74 |
hg ci -m "add" |
|
74 | hg ci -m "add" | |
75 |
|
75 | |||
76 | echo "# updating rc" |
|
76 | echo "# updating rc" | |
77 | echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc |
|
77 | echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc | |
@@ -95,13 +95,13 b' hg verify' | |||||
95 | hg cat -r tip foo |
|
95 | hg cat -r tip foo | |
96 |
|
96 | |||
97 | echo z > z |
|
97 | echo z > z | |
98 |
hg ci -A -m z |
|
98 | hg ci -A -m z z | |
99 | # a bad, evil hook that prints to stdout |
|
99 | # a bad, evil hook that prints to stdout | |
100 | echo 'changegroup.stdout = python ../badhook' >> .hg/hgrc |
|
100 | echo 'changegroup.stdout = python ../badhook' >> .hg/hgrc | |
101 |
|
101 | |||
102 | cd ../local |
|
102 | cd ../local | |
103 | echo r > r |
|
103 | echo r > r | |
104 |
hg ci -A -m z |
|
104 | hg ci -A -m z r | |
105 |
|
105 | |||
106 | echo "# push should succeed even though it has an unexpected response" |
|
106 | echo "# push should succeed even though it has an unexpected response" | |
107 | hg push |
|
107 | hg push |
@@ -37,19 +37,19 b' no changes found' | |||||
37 | # find outgoing |
|
37 | # find outgoing | |
38 | comparing with ssh://user@dummy/remote |
|
38 | comparing with ssh://user@dummy/remote | |
39 | searching for changes |
|
39 | searching for changes | |
40 |
changeset: 1: |
|
40 | changeset: 1:a28a9d1a809c | |
41 | tag: tip |
|
41 | tag: tip | |
42 | user: test |
|
42 | user: test | |
43 |
date: |
|
43 | date: Thu Jan 01 00:00:00 1970 +0000 | |
44 | summary: add |
|
44 | summary: add | |
45 |
|
45 | |||
46 | # find incoming on the remote side |
|
46 | # find incoming on the remote side | |
47 | comparing with ssh://user@dummy/local |
|
47 | comparing with ssh://user@dummy/local | |
48 | searching for changes |
|
48 | searching for changes | |
49 |
changeset: 1: |
|
49 | changeset: 1:a28a9d1a809c | |
50 | tag: tip |
|
50 | tag: tip | |
51 | user: test |
|
51 | user: test | |
52 |
date: |
|
52 | date: Thu Jan 01 00:00:00 1970 +0000 | |
53 | summary: add |
|
53 | summary: add | |
54 |
|
54 | |||
55 | # push |
|
55 | # push | |
@@ -60,10 +60,10 b' remote: adding manifests' | |||||
60 | remote: adding file changes |
|
60 | remote: adding file changes | |
61 | remote: added 1 changesets with 1 changes to 1 files |
|
61 | remote: added 1 changesets with 1 changes to 1 files | |
62 | # check remote tip |
|
62 | # check remote tip | |
63 |
changeset: 1: |
|
63 | changeset: 1:a28a9d1a809c | |
64 | tag: tip |
|
64 | tag: tip | |
65 | user: test |
|
65 | user: test | |
66 |
date: |
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | summary: add |
|
67 | summary: add | |
68 |
|
68 | |||
69 | checking changesets |
|
69 | checking changesets | |
@@ -82,17 +82,17 b' remote: adding manifests' | |||||
82 | remote: adding file changes |
|
82 | remote: adding file changes | |
83 | remote: added 1 changesets with 1 changes to 1 files |
|
83 | remote: added 1 changesets with 1 changes to 1 files | |
84 | remote: KABOOM |
|
84 | remote: KABOOM | |
85 |
changeset: 3: |
|
85 | changeset: 3:1383141674ec | |
86 | tag: tip |
|
86 | tag: tip | |
87 |
parent: 1: |
|
87 | parent: 1:a28a9d1a809c | |
88 | user: test |
|
88 | user: test | |
89 |
date: |
|
89 | date: Thu Jan 01 00:00:00 1970 +0000 | |
90 | summary: z |
|
90 | summary: z | |
91 |
|
91 | |||
92 |
changeset: 2: |
|
92 | changeset: 2:6c0482d977a3 | |
93 |
parent: 0: |
|
93 | parent: 0:1160648e36ce | |
94 | user: test |
|
94 | user: test | |
95 |
date: |
|
95 | date: Thu Jan 01 00:00:00 1970 +0000 | |
96 | summary: z |
|
96 | summary: z | |
97 |
|
97 | |||
98 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio |
|
98 | Got arguments 1:user@dummy 2:hg -R nonexistent serve --stdio | |
@@ -102,6 +102,6 b' Got arguments 1:user@dummy 2:hg -R remot' | |||||
102 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
102 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
103 | Got arguments 1:user@dummy 2:hg -R local serve --stdio |
|
103 | Got arguments 1:user@dummy 2:hg -R local serve --stdio | |
104 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
104 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
105 |
changegroup-in-remote hook: HG_NODE= |
|
105 | changegroup-in-remote hook: HG_NODE=a28a9d1a809cab7d4e2fde4bee738a9ede948b60 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 | |
106 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio |
|
106 | Got arguments 1:user@dummy 2:hg -R remote serve --stdio | |
107 |
changegroup-in-remote hook: HG_NODE= |
|
107 | changegroup-in-remote hook: HG_NODE=1383141674ec756a6056f6a9097618482fe0f4a6 HG_SOURCE=serve HG_URL=remote:ssh:127.0.0.1 |
@@ -29,7 +29,7 b' cd remote' | |||||
29 | hg init |
|
29 | hg init | |
30 | echo foo > bar |
|
30 | echo foo > bar | |
31 | hg add bar |
|
31 | hg add bar | |
32 |
hg commit -m"test" |
|
32 | hg commit -m"test" | |
33 | hg tip |
|
33 | hg tip | |
34 |
|
34 | |||
35 | cd .. |
|
35 | cd .. | |
@@ -42,7 +42,7 b' cat bar' | |||||
42 |
|
42 | |||
43 | cd ../remote |
|
43 | cd ../remote | |
44 | echo baz > quux |
|
44 | echo baz > quux | |
45 |
hg commit -A -mtest2 |
|
45 | hg commit -A -mtest2 | |
46 | # check for HTTP opener failures when cachefile does not exist |
|
46 | # check for HTTP opener failures when cachefile does not exist | |
47 | rm .hg/*.cache |
|
47 | rm .hg/*.cache | |
48 |
|
48 | |||
@@ -54,7 +54,7 b' hg pull | sed -e "s,:$HGPORT/,:\\$HGPORT/' | |||||
54 | echo '% trying to push' |
|
54 | echo '% trying to push' | |
55 | hg update |
|
55 | hg update | |
56 | echo more foo >> bar |
|
56 | echo more foo >> bar | |
57 |
hg commit -m"test" |
|
57 | hg commit -m"test" | |
58 | hg push | sed -e "s,:$HGPORT/,:\$HGPORT/," |
|
58 | hg push | sed -e "s,:$HGPORT/,:\$HGPORT/," | |
59 |
|
59 | |||
60 | echo '% trying clone -r' |
|
60 | echo '% trying clone -r' |
@@ -1,10 +1,10 b'' | |||||
1 | abort: error: Connection refused |
|
1 | abort: error: Connection refused | |
2 | 255 |
|
2 | 255 | |
3 | copy: No such file or directory |
|
3 | copy: No such file or directory | |
4 |
changeset: 0: |
|
4 | changeset: 0:61c9426e69fe | |
5 | tag: tip |
|
5 | tag: tip | |
6 | user: test |
|
6 | user: test | |
7 |
date: |
|
7 | date: Thu Jan 01 00:00:00 1970 +0000 | |
8 | summary: test |
|
8 | summary: test | |
9 |
|
9 | |||
10 | requesting all changes |
|
10 | requesting all changes | |
@@ -21,7 +21,7 b' checking files' | |||||
21 | 1 files, 1 changesets, 1 total revisions |
|
21 | 1 files, 1 changesets, 1 total revisions | |
22 | foo |
|
22 | foo | |
23 | adding quux |
|
23 | adding quux | |
24 |
changegroup hook: HG_NODE= |
|
24 | changegroup hook: HG_NODE=822d6e31f08b9d6e3b898ce5e52efc0a4bf4905a HG_SOURCE=pull HG_URL=http://localhost:$HGPORT/remote | |
25 | pulling from static-http://localhost:$HGPORT/remote |
|
25 | pulling from static-http://localhost:$HGPORT/remote | |
26 | searching for changes |
|
26 | searching for changes | |
27 | adding changesets |
|
27 | adding changesets |
@@ -111,7 +111,7 b' hg status . in repo root:' | |||||
111 | $ cd repo2 |
|
111 | $ cd repo2 | |
112 | $ touch modified removed deleted ignored |
|
112 | $ touch modified removed deleted ignored | |
113 | $ echo "^ignored$" > .hgignore |
|
113 | $ echo "^ignored$" > .hgignore | |
114 |
$ hg ci -A -m 'initial checkin' |
|
114 | $ hg ci -A -m 'initial checkin' | |
115 | adding .hgignore |
|
115 | adding .hgignore | |
116 | adding deleted |
|
116 | adding deleted | |
117 | adding modified |
|
117 | adding modified |
@@ -106,7 +106,7 b' hg status . in repo root:' | |||||
106 | $ cd repo2 |
|
106 | $ cd repo2 | |
107 | $ touch modified removed deleted ignored |
|
107 | $ touch modified removed deleted ignored | |
108 | $ echo "^ignored$" > .hgignore |
|
108 | $ echo "^ignored$" > .hgignore | |
109 |
$ hg ci -A -m 'initial checkin' |
|
109 | $ hg ci -A -m 'initial checkin' | |
110 | adding .hgignore |
|
110 | adding .hgignore | |
111 | adding deleted |
|
111 | adding deleted | |
112 | adding modified |
|
112 | adding modified | |
@@ -231,7 +231,7 b' hg status -i ignoreddir/file:' | |||||
231 | $ hg init repo4 |
|
231 | $ hg init repo4 | |
232 | $ cd repo4 |
|
232 | $ cd repo4 | |
233 | $ touch modified removed deleted |
|
233 | $ touch modified removed deleted | |
234 |
$ hg ci -q -A -m 'initial checkin' |
|
234 | $ hg ci -q -A -m 'initial checkin' | |
235 | $ touch added unknown |
|
235 | $ touch added unknown | |
236 | $ hg add added |
|
236 | $ hg add added | |
237 | $ hg remove removed |
|
237 | $ hg remove removed |
@@ -3,87 +3,87 b'' | |||||
3 |
|
3 | |||
4 | $ echo a > a |
|
4 | $ echo a > a | |
5 | $ hg add a |
|
5 | $ hg add a | |
6 |
$ hg commit -m "test" |
|
6 | $ hg commit -m "test" | |
7 | $ hg history |
|
7 | $ hg history | |
8 |
changeset: 0: |
|
8 | changeset: 0:acb14030fe0a | |
9 | tag: tip |
|
9 | tag: tip | |
10 | user: test |
|
10 | user: test | |
11 |
date: |
|
11 | date: Thu Jan 01 00:00:00 1970 +0000 | |
12 | summary: test |
|
12 | summary: test | |
13 |
|
13 | |||
14 |
|
14 | |||
15 | $ hg tag ' ' |
|
15 | $ hg tag ' ' | |
16 | abort: tag names cannot consist entirely of whitespace |
|
16 | abort: tag names cannot consist entirely of whitespace | |
17 |
|
17 | |||
18 |
$ hg tag |
|
18 | $ hg tag "bleah" | |
19 | $ hg history |
|
19 | $ hg history | |
20 |
changeset: 1: |
|
20 | changeset: 1:d4f0d2909abc | |
21 | tag: tip |
|
21 | tag: tip | |
22 | user: test |
|
22 | user: test | |
23 |
date: |
|
23 | date: Thu Jan 01 00:00:00 1970 +0000 | |
24 |
summary: Added tag bleah for changeset |
|
24 | summary: Added tag bleah for changeset acb14030fe0a | |
25 |
|
25 | |||
26 |
changeset: 0: |
|
26 | changeset: 0:acb14030fe0a | |
27 | tag: bleah |
|
27 | tag: bleah | |
28 | user: test |
|
28 | user: test | |
29 |
date: |
|
29 | date: Thu Jan 01 00:00:00 1970 +0000 | |
30 | summary: test |
|
30 | summary: test | |
31 |
|
31 | |||
32 |
|
32 | |||
33 | $ echo foo >> .hgtags |
|
33 | $ echo foo >> .hgtags | |
34 |
$ hg tag |
|
34 | $ hg tag "bleah2" || echo "failed" | |
35 | abort: working copy of .hgtags is changed (please commit .hgtags manually) |
|
35 | abort: working copy of .hgtags is changed (please commit .hgtags manually) | |
36 | failed |
|
36 | failed | |
37 |
|
37 | |||
38 | $ hg revert .hgtags |
|
38 | $ hg revert .hgtags | |
39 |
$ hg tag |
|
39 | $ hg tag -r 0 x y z y y z || echo "failed" | |
40 | abort: tag names must be unique |
|
40 | abort: tag names must be unique | |
41 | failed |
|
41 | failed | |
42 |
$ hg tag |
|
42 | $ hg tag tap nada dot tip null . || echo "failed" | |
43 | abort: the name 'tip' is reserved |
|
43 | abort: the name 'tip' is reserved | |
44 | failed |
|
44 | failed | |
45 |
$ hg tag |
|
45 | $ hg tag "bleah" || echo "failed" | |
46 | abort: tag 'bleah' already exists (use -f to force) |
|
46 | abort: tag 'bleah' already exists (use -f to force) | |
47 | failed |
|
47 | failed | |
48 |
$ hg tag |
|
48 | $ hg tag "blecch" "bleah" || echo "failed" | |
49 | abort: tag 'bleah' already exists (use -f to force) |
|
49 | abort: tag 'bleah' already exists (use -f to force) | |
50 | failed |
|
50 | failed | |
51 |
|
51 | |||
52 |
$ hg tag |
|
52 | $ hg tag --remove "blecch" || echo "failed" | |
53 | abort: tag 'blecch' does not exist |
|
53 | abort: tag 'blecch' does not exist | |
54 | failed |
|
54 | failed | |
55 |
$ hg tag |
|
55 | $ hg tag --remove "bleah" "blecch" "blough" || echo "failed" | |
56 | abort: tag 'blecch' does not exist |
|
56 | abort: tag 'blecch' does not exist | |
57 | failed |
|
57 | failed | |
58 |
|
58 | |||
59 |
$ hg tag |
|
59 | $ hg tag -r 0 "bleah0" | |
60 |
$ hg tag -l - |
|
60 | $ hg tag -l -r 1 "bleah1" | |
61 |
$ hg tag |
|
61 | $ hg tag gack gawk gorp | |
62 |
$ hg tag - |
|
62 | $ hg tag -f gack | |
63 |
$ hg tag |
|
63 | $ hg tag --remove gack gorp | |
64 |
|
64 | |||
65 | $ cat .hgtags |
|
65 | $ cat .hgtags | |
66 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah |
|
66 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah | |
67 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0 |
|
67 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 | |
68 | 868cc8fbb43b754ad09fa109885d243fc49adae7 gack |
|
68 | 336fccc858a4eb69609a291105009e484a6b6b8d gack | |
69 | 868cc8fbb43b754ad09fa109885d243fc49adae7 gawk |
|
69 | 336fccc858a4eb69609a291105009e484a6b6b8d gawk | |
70 | 868cc8fbb43b754ad09fa109885d243fc49adae7 gorp |
|
70 | 336fccc858a4eb69609a291105009e484a6b6b8d gorp | |
71 | 868cc8fbb43b754ad09fa109885d243fc49adae7 gack |
|
71 | 336fccc858a4eb69609a291105009e484a6b6b8d gack | |
72 | 3807bcf62c5614cb6c16436b514d7764ca5f1631 gack |
|
72 | 799667b6f2d9b957f73fa644a918c2df22bab58f gack | |
73 | 3807bcf62c5614cb6c16436b514d7764ca5f1631 gack |
|
73 | 799667b6f2d9b957f73fa644a918c2df22bab58f gack | |
74 | 0000000000000000000000000000000000000000 gack |
|
74 | 0000000000000000000000000000000000000000 gack | |
75 | 868cc8fbb43b754ad09fa109885d243fc49adae7 gorp |
|
75 | 336fccc858a4eb69609a291105009e484a6b6b8d gorp | |
76 | 0000000000000000000000000000000000000000 gorp |
|
76 | 0000000000000000000000000000000000000000 gorp | |
77 | $ cat .hg/localtags |
|
77 | $ cat .hg/localtags | |
78 | 3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1 |
|
78 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | |
79 |
|
79 | |||
80 | $ hg update 0 |
|
80 | $ hg update 0 | |
81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 |
$ hg tag |
|
82 | $ hg tag "foobar" | |
83 | $ cat .hgtags |
|
83 | $ cat .hgtags | |
84 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar |
|
84 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |
85 | $ cat .hg/localtags |
|
85 | $ cat .hg/localtags | |
86 | 3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1 |
|
86 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | |
87 |
|
87 | |||
88 | $ hg tag -l 'xx |
|
88 | $ hg tag -l 'xx | |
89 | > newline' |
|
89 | > newline' | |
@@ -95,49 +95,49 b' cloning local tags' | |||||
95 |
|
95 | |||
96 | $ cd .. |
|
96 | $ cd .. | |
97 | $ hg -R test log -r0:5 |
|
97 | $ hg -R test log -r0:5 | |
98 |
changeset: 0: |
|
98 | changeset: 0:acb14030fe0a | |
99 | tag: bleah |
|
99 | tag: bleah | |
100 | tag: bleah0 |
|
100 | tag: bleah0 | |
101 | tag: foobar |
|
101 | tag: foobar | |
102 | user: test |
|
102 | user: test | |
103 |
date: |
|
103 | date: Thu Jan 01 00:00:00 1970 +0000 | |
104 | summary: test |
|
104 | summary: test | |
105 |
|
105 | |||
106 |
changeset: 1: |
|
106 | changeset: 1:d4f0d2909abc | |
107 | tag: bleah1 |
|
107 | tag: bleah1 | |
108 | user: test |
|
108 | user: test | |
109 |
date: |
|
109 | date: Thu Jan 01 00:00:00 1970 +0000 | |
110 |
summary: Added tag bleah for changeset |
|
110 | summary: Added tag bleah for changeset acb14030fe0a | |
111 |
|
111 | |||
112 |
changeset: 2: |
|
112 | changeset: 2:336fccc858a4 | |
113 | tag: gawk |
|
113 | tag: gawk | |
114 | user: test |
|
114 | user: test | |
115 |
date: |
|
115 | date: Thu Jan 01 00:00:00 1970 +0000 | |
116 |
summary: Added tag bleah0 for changeset |
|
116 | summary: Added tag bleah0 for changeset acb14030fe0a | |
117 |
|
117 | |||
118 |
changeset: 3: |
|
118 | changeset: 3:799667b6f2d9 | |
119 | user: test |
|
119 | user: test | |
120 |
date: |
|
120 | date: Thu Jan 01 00:00:00 1970 +0000 | |
121 |
summary: Added tag gack, gawk, gorp for changeset |
|
121 | summary: Added tag gack, gawk, gorp for changeset 336fccc858a4 | |
122 |
|
122 | |||
123 |
changeset: 4:1 |
|
123 | changeset: 4:154eeb7c0138 | |
124 | user: test |
|
124 | user: test | |
125 |
date: |
|
125 | date: Thu Jan 01 00:00:00 1970 +0000 | |
126 |
summary: Added tag gack for changeset |
|
126 | summary: Added tag gack for changeset 799667b6f2d9 | |
127 |
|
127 | |||
128 |
changeset: 5: |
|
128 | changeset: 5:b4bb47aaff09 | |
129 | user: test |
|
129 | user: test | |
130 |
date: |
|
130 | date: Thu Jan 01 00:00:00 1970 +0000 | |
131 | summary: Removed tag gack, gorp |
|
131 | summary: Removed tag gack, gorp | |
132 |
|
132 | |||
133 | $ hg clone -q -rbleah1 test test1 |
|
133 | $ hg clone -q -rbleah1 test test1 | |
134 | $ hg -R test1 parents --style=compact |
|
134 | $ hg -R test1 parents --style=compact | |
135 |
1[tip] |
|
135 | 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test | |
136 |
Added tag bleah for changeset |
|
136 | Added tag bleah for changeset acb14030fe0a | |
137 |
|
137 | |||
138 | $ hg clone -q -r5 test#bleah1 test2 |
|
138 | $ hg clone -q -r5 test#bleah1 test2 | |
139 | $ hg -R test2 parents --style=compact |
|
139 | $ hg -R test2 parents --style=compact | |
140 |
5[tip] |
|
140 | 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test | |
141 | Removed tag gack, gorp |
|
141 | Removed tag gack, gorp | |
142 |
|
142 | |||
143 | $ hg clone -q -U test#bleah1 test3 |
|
143 | $ hg clone -q -U test#bleah1 test3 | |
@@ -152,24 +152,24 b' issue 601' | |||||
152 | > f = file('.hg/localtags', 'w'); f.write(last); f.close() |
|
152 | > f = file('.hg/localtags', 'w'); f.write(last); f.close() | |
153 | > EOF |
|
153 | > EOF | |
154 | $ cat .hg/localtags; echo |
|
154 | $ cat .hg/localtags; echo | |
155 | 3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1 |
|
155 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | |
156 | $ hg tag -l localnewline |
|
156 | $ hg tag -l localnewline | |
157 | $ cat .hg/localtags; echo |
|
157 | $ cat .hg/localtags; echo | |
158 | 3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1 |
|
158 | d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1 | |
159 | f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline |
|
159 | c2899151f4e76890c602a2597a650a72666681bf localnewline | |
160 |
|
160 | |||
161 |
|
161 | |||
162 | $ python << EOF |
|
162 | $ python << EOF | |
163 | > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close() |
|
163 | > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close() | |
164 | > f = file('.hgtags', 'w'); f.write(last); f.close() |
|
164 | > f = file('.hgtags', 'w'); f.write(last); f.close() | |
165 | > EOF |
|
165 | > EOF | |
166 |
$ hg ci - |
|
166 | $ hg ci -m'broken manual edit of .hgtags' | |
167 | $ cat .hgtags; echo |
|
167 | $ cat .hgtags; echo | |
168 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar |
|
168 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |
169 |
$ hg tag |
|
169 | $ hg tag newline | |
170 | $ cat .hgtags; echo |
|
170 | $ cat .hgtags; echo | |
171 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar |
|
171 | acb14030fe0a21b60322c440ad2d20cf7685a376 foobar | |
172 | 6ae703d793c8b1f097116869275ecd97b2977a2b newline |
|
172 | a0eea09de1eeec777b46f2085260a373b2fbc293 newline | |
173 |
|
173 | |||
174 |
|
174 | |||
175 | tag and branch using same name |
|
175 | tag and branch using same name |
@@ -309,7 +309,7 b' test filter with failed patch' | |||||
309 | $ hg up 0 |
|
309 | $ hg up 0 | |
310 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
310 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
311 | $ echo foo > b1 |
|
311 | $ echo foo > b1 | |
312 |
$ hg ci - |
|
312 | $ hg ci -Am foo | |
313 | adding b1 |
|
313 | adding b1 | |
314 | adding test-filter |
|
314 | adding test-filter | |
315 | created new head |
|
315 | created new head |
@@ -5,7 +5,7 b' cd a' | |||||
5 | hg init |
|
5 | hg init | |
6 | echo 123 > a |
|
6 | echo 123 > a | |
7 | hg add a |
|
7 | hg add a | |
8 |
hg commit -m "a" -u a |
|
8 | hg commit -m "a" -u a | |
9 |
|
9 | |||
10 | cd .. |
|
10 | cd .. | |
11 | mkdir b |
|
11 | mkdir b | |
@@ -13,7 +13,7 b' cd b' | |||||
13 | hg init |
|
13 | hg init | |
14 | echo 321 > b |
|
14 | echo 321 > b | |
15 | hg add b |
|
15 | hg add b | |
16 |
hg commit -m "b" -u b |
|
16 | hg commit -m "b" -u b | |
17 |
|
17 | |||
18 | hg pull ../a |
|
18 | hg pull ../a | |
19 | hg pull -f ../a |
|
19 | hg pull -f ../a |
@@ -9,15 +9,15 b' adding manifests' | |||||
9 | adding file changes |
|
9 | adding file changes | |
10 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
10 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
11 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
11 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
12 | changeset: 1:bdcee5d51fa6 |
|
12 | changeset: 1:9a79c33a9db3 | |
13 | tag: tip |
|
13 | tag: tip | |
14 | parent: -1:000000000000 |
|
14 | parent: -1:000000000000 | |
15 | user: a |
|
15 | user: a | |
16 |
date: |
|
16 | date: Thu Jan 01 00:00:00 1970 +0000 | |
17 | summary: a |
|
17 | summary: a | |
18 |
|
18 | |||
19 |
changeset: 0: |
|
19 | changeset: 0:01f8062b2de5 | |
20 | user: b |
|
20 | user: b | |
21 |
date: |
|
21 | date: Thu Jan 01 00:00:00 1970 +0000 | |
22 | summary: b |
|
22 | summary: b | |
23 |
|
23 |
@@ -6,7 +6,7 b'' | |||||
6 | $ echo a > a |
|
6 | $ echo a > a | |
7 | $ hg addremove |
|
7 | $ hg addremove | |
8 | adding a |
|
8 | adding a | |
9 |
$ hg commit -m "1" |
|
9 | $ hg commit -m "1" | |
10 |
|
10 | |||
11 | $ hg clone . ../r2 |
|
11 | $ hg clone . ../r2 | |
12 | updating to branch default |
|
12 | updating to branch default | |
@@ -16,7 +16,7 b'' | |||||
16 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | $ echo abc > a |
|
17 | $ echo abc > a | |
18 | $ hg diff --nodates |
|
18 | $ hg diff --nodates | |
19 | diff -r 33aaa84a386b a |
|
19 | diff -r c19d34741b0a a | |
20 | --- a/a |
|
20 | --- a/a | |
21 | +++ b/a |
|
21 | +++ b/a | |
22 | @@ -1,1 +1,1 @@ |
|
22 | @@ -1,1 +1,1 @@ | |
@@ -28,16 +28,16 b'' | |||||
28 | $ echo a2 > a |
|
28 | $ echo a2 > a | |
29 | $ hg addremove |
|
29 | $ hg addremove | |
30 | adding b |
|
30 | adding b | |
31 |
$ hg commit -m "2" |
|
31 | $ hg commit -m "2" | |
32 |
|
32 | |||
33 | $ cd ../r2 |
|
33 | $ cd ../r2 | |
34 | $ hg -q pull ../r1 |
|
34 | $ hg -q pull ../r1 | |
35 | $ hg status |
|
35 | $ hg status | |
36 | M a |
|
36 | M a | |
37 | $ hg parents |
|
37 | $ hg parents | |
38 |
changeset: 0: |
|
38 | changeset: 0:c19d34741b0a | |
39 | user: test |
|
39 | user: test | |
40 |
date: |
|
40 | date: Thu Jan 01 00:00:00 1970 +0000 | |
41 | summary: 1 |
|
41 | summary: 1 | |
42 |
|
42 | |||
43 | $ hg --debug up |
|
43 | $ hg --debug up | |
@@ -46,28 +46,28 b'' | |||||
46 | b |
|
46 | b | |
47 | resolving manifests |
|
47 | resolving manifests | |
48 | overwrite False partial False |
|
48 | overwrite False partial False | |
49 | ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
|
49 | ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb | |
50 | a: versions differ -> m |
|
50 | a: versions differ -> m | |
51 | b: remote created -> g |
|
51 | b: remote created -> g | |
52 | preserving a for resolve of a |
|
52 | preserving a for resolve of a | |
53 | updating: a 1/2 files (50.00%) |
|
53 | updating: a 1/2 files (50.00%) | |
54 | picked tool 'true' for a (binary False symlink False) |
|
54 | picked tool 'true' for a (binary False symlink False) | |
55 | merging a |
|
55 | merging a | |
56 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
56 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | |
57 | updating: b 2/2 files (100.00%) |
|
57 | updating: b 2/2 files (100.00%) | |
58 | getting b |
|
58 | getting b | |
59 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
59 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
60 | $ hg parents |
|
60 | $ hg parents | |
61 |
changeset: 1: |
|
61 | changeset: 1:1e71731e6fbb | |
62 | tag: tip |
|
62 | tag: tip | |
63 | user: test |
|
63 | user: test | |
64 |
date: |
|
64 | date: Thu Jan 01 00:00:00 1970 +0000 | |
65 | summary: 2 |
|
65 | summary: 2 | |
66 |
|
66 | |||
67 | $ hg --debug up 0 |
|
67 | $ hg --debug up 0 | |
68 | resolving manifests |
|
68 | resolving manifests | |
69 | overwrite False partial False |
|
69 | overwrite False partial False | |
70 | ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b |
|
70 | ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a | |
71 | a: versions differ -> m |
|
71 | a: versions differ -> m | |
72 | b: other deleted -> r |
|
72 | b: other deleted -> r | |
73 | preserving a for resolve of a |
|
73 | preserving a for resolve of a | |
@@ -76,21 +76,21 b'' | |||||
76 | updating: a 2/2 files (100.00%) |
|
76 | updating: a 2/2 files (100.00%) | |
77 | picked tool 'true' for a (binary False symlink False) |
|
77 | picked tool 'true' for a (binary False symlink False) | |
78 | merging a |
|
78 | merging a | |
79 | my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
|
79 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | |
80 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
80 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
81 | $ hg parents |
|
81 | $ hg parents | |
82 |
changeset: 0: |
|
82 | changeset: 0:c19d34741b0a | |
83 | user: test |
|
83 | user: test | |
84 |
date: |
|
84 | date: Thu Jan 01 00:00:00 1970 +0000 | |
85 | summary: 1 |
|
85 | summary: 1 | |
86 |
|
86 | |||
87 | $ hg --debug merge || echo failed |
|
87 | $ hg --debug merge || echo failed | |
88 | abort: there is nothing to merge - use "hg update" instead |
|
88 | abort: there is nothing to merge - use "hg update" instead | |
89 | failed |
|
89 | failed | |
90 | $ hg parents |
|
90 | $ hg parents | |
91 |
changeset: 0: |
|
91 | changeset: 0:c19d34741b0a | |
92 | user: test |
|
92 | user: test | |
93 |
date: |
|
93 | date: Thu Jan 01 00:00:00 1970 +0000 | |
94 | summary: 1 |
|
94 | summary: 1 | |
95 |
|
95 | |||
96 | $ hg --debug up |
|
96 | $ hg --debug up | |
@@ -99,44 +99,44 b'' | |||||
99 | b |
|
99 | b | |
100 | resolving manifests |
|
100 | resolving manifests | |
101 | overwrite False partial False |
|
101 | overwrite False partial False | |
102 | ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299 |
|
102 | ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb | |
103 | a: versions differ -> m |
|
103 | a: versions differ -> m | |
104 | b: remote created -> g |
|
104 | b: remote created -> g | |
105 | preserving a for resolve of a |
|
105 | preserving a for resolve of a | |
106 | updating: a 1/2 files (50.00%) |
|
106 | updating: a 1/2 files (50.00%) | |
107 | picked tool 'true' for a (binary False symlink False) |
|
107 | picked tool 'true' for a (binary False symlink False) | |
108 | merging a |
|
108 | merging a | |
109 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
109 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | |
110 | updating: b 2/2 files (100.00%) |
|
110 | updating: b 2/2 files (100.00%) | |
111 | getting b |
|
111 | getting b | |
112 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
112 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
113 | $ hg parents |
|
113 | $ hg parents | |
114 |
changeset: 1: |
|
114 | changeset: 1:1e71731e6fbb | |
115 | tag: tip |
|
115 | tag: tip | |
116 | user: test |
|
116 | user: test | |
117 |
date: |
|
117 | date: Thu Jan 01 00:00:00 1970 +0000 | |
118 | summary: 2 |
|
118 | summary: 2 | |
119 |
|
119 | |||
120 | $ hg -v history |
|
120 | $ hg -v history | |
121 |
changeset: 1: |
|
121 | changeset: 1:1e71731e6fbb | |
122 | tag: tip |
|
122 | tag: tip | |
123 | user: test |
|
123 | user: test | |
124 |
date: |
|
124 | date: Thu Jan 01 00:00:00 1970 +0000 | |
125 | files: a b |
|
125 | files: a b | |
126 | description: |
|
126 | description: | |
127 | 2 |
|
127 | 2 | |
128 |
|
128 | |||
129 |
|
129 | |||
130 |
changeset: 0: |
|
130 | changeset: 0:c19d34741b0a | |
131 | user: test |
|
131 | user: test | |
132 |
date: |
|
132 | date: Thu Jan 01 00:00:00 1970 +0000 | |
133 | files: a |
|
133 | files: a | |
134 | description: |
|
134 | description: | |
135 | 1 |
|
135 | 1 | |
136 |
|
136 | |||
137 |
|
137 | |||
138 | $ hg diff --nodates |
|
138 | $ hg diff --nodates | |
139 | diff -r 802f095af299 a |
|
139 | diff -r 1e71731e6fbb a | |
140 | --- a/a |
|
140 | --- a/a | |
141 | +++ b/a |
|
141 | +++ b/a | |
142 | @@ -1,1 +1,1 @@ |
|
142 | @@ -1,1 +1,1 @@ | |
@@ -153,7 +153,7 b' create a second head' | |||||
153 | $ echo a3 > a |
|
153 | $ echo a3 > a | |
154 | $ hg addremove |
|
154 | $ hg addremove | |
155 | adding b |
|
155 | adding b | |
156 |
$ hg commit -m "3" |
|
156 | $ hg commit -m "3" | |
157 | created new head |
|
157 | created new head | |
158 |
|
158 | |||
159 | $ cd ../r2 |
|
159 | $ cd ../r2 | |
@@ -161,9 +161,9 b' create a second head' | |||||
161 | $ hg status |
|
161 | $ hg status | |
162 | M a |
|
162 | M a | |
163 | $ hg parents |
|
163 | $ hg parents | |
164 |
changeset: 1: |
|
164 | changeset: 1:1e71731e6fbb | |
165 | user: test |
|
165 | user: test | |
166 |
date: |
|
166 | date: Thu Jan 01 00:00:00 1970 +0000 | |
167 | summary: 2 |
|
167 | summary: 2 | |
168 |
|
168 | |||
169 | $ hg --debug up || echo failed |
|
169 | $ hg --debug up || echo failed | |
@@ -176,7 +176,7 b' create a second head' | |||||
176 | searching for copies back to rev 1 |
|
176 | searching for copies back to rev 1 | |
177 | resolving manifests |
|
177 | resolving manifests | |
178 | overwrite False partial False |
|
178 | overwrite False partial False | |
179 | ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d |
|
179 | ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4 | |
180 | a: versions differ -> m |
|
180 | a: versions differ -> m | |
181 | b: versions differ -> m |
|
181 | b: versions differ -> m | |
182 | preserving a for resolve of a |
|
182 | preserving a for resolve of a | |
@@ -184,28 +184,28 b' create a second head' | |||||
184 | updating: a 1/2 files (50.00%) |
|
184 | updating: a 1/2 files (50.00%) | |
185 | picked tool 'true' for a (binary False symlink False) |
|
185 | picked tool 'true' for a (binary False symlink False) | |
186 | merging a |
|
186 | merging a | |
187 | my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
|
187 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | |
188 | updating: b 2/2 files (100.00%) |
|
188 | updating: b 2/2 files (100.00%) | |
189 | picked tool 'true' for b (binary False symlink False) |
|
189 | picked tool 'true' for b (binary False symlink False) | |
190 | merging b |
|
190 | merging b | |
191 |
my b@ |
|
191 | my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 | |
192 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
192 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
193 | (branch merge, don't forget to commit) |
|
193 | (branch merge, don't forget to commit) | |
194 | $ hg parents |
|
194 | $ hg parents | |
195 |
changeset: 1: |
|
195 | changeset: 1:1e71731e6fbb | |
196 | user: test |
|
196 | user: test | |
197 |
date: |
|
197 | date: Thu Jan 01 00:00:00 1970 +0000 | |
198 | summary: 2 |
|
198 | summary: 2 | |
199 |
|
199 | |||
200 |
changeset: 2: |
|
200 | changeset: 2:83c51d0caff4 | |
201 | tag: tip |
|
201 | tag: tip | |
202 |
parent: 0: |
|
202 | parent: 0:c19d34741b0a | |
203 | user: test |
|
203 | user: test | |
204 |
date: |
|
204 | date: Thu Jan 01 00:00:00 1970 +0000 | |
205 | summary: 3 |
|
205 | summary: 3 | |
206 |
|
206 | |||
207 | $ hg diff --nodates |
|
207 | $ hg diff --nodates | |
208 | diff -r 802f095af299 a |
|
208 | diff -r 1e71731e6fbb a | |
209 | --- a/a |
|
209 | --- a/a | |
210 | +++ b/a |
|
210 | +++ b/a | |
211 | @@ -1,1 +1,1 @@ |
|
211 | @@ -1,1 +1,1 @@ |
@@ -3,11 +3,11 b'' | |||||
3 | hg init |
|
3 | hg init | |
4 | touch a |
|
4 | touch a | |
5 | hg add a |
|
5 | hg add a | |
6 |
hg commit -m "Added a" |
|
6 | hg commit -m "Added a" | |
7 |
|
7 | |||
8 | touch main |
|
8 | touch main | |
9 | hg add main |
|
9 | hg add main | |
10 |
hg commit -m "Added main" |
|
10 | hg commit -m "Added main" | |
11 | hg checkout 0 |
|
11 | hg checkout 0 | |
12 |
|
12 | |||
13 | echo Main should be gone |
|
13 | echo Main should be gone | |
@@ -15,10 +15,10 b' ls' | |||||
15 |
|
15 | |||
16 | touch side1 |
|
16 | touch side1 | |
17 | hg add side1 |
|
17 | hg add side1 | |
18 |
hg commit -m "Added side1" |
|
18 | hg commit -m "Added side1" | |
19 | touch side2 |
|
19 | touch side2 | |
20 | hg add side2 |
|
20 | hg add side2 | |
21 |
hg commit -m "Added side2" |
|
21 | hg commit -m "Added side2" | |
22 |
|
22 | |||
23 | hg log |
|
23 | hg log | |
24 |
|
24 |
@@ -2,38 +2,38 b' 0 files updated, 0 files merged, 1 files' | |||||
2 | Main should be gone |
|
2 | Main should be gone | |
3 | a |
|
3 | a | |
4 | created new head |
|
4 | created new head | |
5 |
changeset: 3: |
|
5 | changeset: 3:91ebc10ed028 | |
6 | tag: tip |
|
6 | tag: tip | |
7 | user: test |
|
7 | user: test | |
8 |
date: |
|
8 | date: Thu Jan 01 00:00:00 1970 +0000 | |
9 | summary: Added side2 |
|
9 | summary: Added side2 | |
10 |
|
10 | |||
11 |
changeset: 2: |
|
11 | changeset: 2:b932d7dbb1e1 | |
12 |
parent: 0: |
|
12 | parent: 0:c2eda428b523 | |
13 | user: test |
|
13 | user: test | |
14 |
date: |
|
14 | date: Thu Jan 01 00:00:00 1970 +0000 | |
15 | summary: Added side1 |
|
15 | summary: Added side1 | |
16 |
|
16 | |||
17 |
changeset: 1: |
|
17 | changeset: 1:71a760306caf | |
18 | user: test |
|
18 | user: test | |
19 |
date: |
|
19 | date: Thu Jan 01 00:00:00 1970 +0000 | |
20 | summary: Added main |
|
20 | summary: Added main | |
21 |
|
21 | |||
22 |
changeset: 0: |
|
22 | changeset: 0:c2eda428b523 | |
23 | user: test |
|
23 | user: test | |
24 |
date: |
|
24 | date: Thu Jan 01 00:00:00 1970 +0000 | |
25 | summary: Added a |
|
25 | summary: Added a | |
26 |
|
26 | |||
27 | Should have two heads, side2 and main |
|
27 | Should have two heads, side2 and main | |
28 |
changeset: 3: |
|
28 | changeset: 3:91ebc10ed028 | |
29 | tag: tip |
|
29 | tag: tip | |
30 | user: test |
|
30 | user: test | |
31 |
date: |
|
31 | date: Thu Jan 01 00:00:00 1970 +0000 | |
32 | summary: Added side2 |
|
32 | summary: Added side2 | |
33 |
|
33 | |||
34 |
changeset: 1: |
|
34 | changeset: 1:71a760306caf | |
35 | user: test |
|
35 | user: test | |
36 |
date: |
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 | |
37 | summary: Added main |
|
37 | summary: Added main | |
38 |
|
38 | |||
39 | Should show a side1 side2 |
|
39 | Should show a side1 side2 | |
@@ -42,7 +42,7 b' side1' | |||||
42 | side2 |
|
42 | side2 | |
43 | resolving manifests |
|
43 | resolving manifests | |
44 | overwrite True partial False |
|
44 | overwrite True partial False | |
45 | ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8 |
|
45 | ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf | |
46 | side2: other deleted -> r |
|
46 | side2: other deleted -> r | |
47 | side1: other deleted -> r |
|
47 | side1: other deleted -> r | |
48 | main: remote created -> g |
|
48 | main: remote created -> g |
@@ -29,7 +29,7 b'' | |||||
29 | adding mammals/Procyonidae/coatimundi |
|
29 | adding mammals/Procyonidae/coatimundi | |
30 | adding mammals/Procyonidae/raccoon |
|
30 | adding mammals/Procyonidae/raccoon | |
31 | adding mammals/skunk |
|
31 | adding mammals/skunk | |
32 |
$ hg commit -m "commit #0" |
|
32 | $ hg commit -m "commit #0" | |
33 |
|
33 | |||
34 | $ hg debugwalk |
|
34 | $ hg debugwalk | |
35 | f beans/black beans/black |
|
35 | f beans/black beans/black |
General Comments 0
You need to be logged in to leave comments.
Login now