Show More
@@ -1200,6 +1200,11 b' class simplekeyvaluefile(object):' | |||||
1200 | 'unbundle', |
|
1200 | 'unbundle', | |
1201 | ] |
|
1201 | ] | |
1202 |
|
1202 | |||
|
1203 | _reportnewcssource = [ | |||
|
1204 | 'pull', | |||
|
1205 | 'unbundle', | |||
|
1206 | ] | |||
|
1207 | ||||
1203 | def registersummarycallback(repo, otr, txnname=''): |
|
1208 | def registersummarycallback(repo, otr, txnname=''): | |
1204 | """register a callback to issue a summary after the transaction is closed |
|
1209 | """register a callback to issue a summary after the transaction is closed | |
1205 | """ |
|
1210 | """ | |
@@ -1226,3 +1231,34 b' def registersummarycallback(repo, otr, t' | |||||
1226 | if obsoleted: |
|
1231 | if obsoleted: | |
1227 | repo.ui.status(_('obsoleted %i changesets\n') |
|
1232 | repo.ui.status(_('obsoleted %i changesets\n') | |
1228 | % len(obsoleted)) |
|
1233 | % len(obsoleted)) | |
|
1234 | ||||
|
1235 | if txmatch(_reportnewcssource): | |||
|
1236 | @reportsummary | |||
|
1237 | def reportnewcs(repo, tr): | |||
|
1238 | """Report the range of new revisions pulled/unbundled.""" | |||
|
1239 | newrevs = list(tr.changes.get('revs', set())) | |||
|
1240 | if not newrevs: | |||
|
1241 | return | |||
|
1242 | ||||
|
1243 | # Compute the bounds of new revisions' range, excluding obsoletes. | |||
|
1244 | unfi = repo.unfiltered() | |||
|
1245 | minrev, maxrev = None, None | |||
|
1246 | newrevs.sort() | |||
|
1247 | for r in newrevs: | |||
|
1248 | if not unfi[r].obsolete(): | |||
|
1249 | minrev = repo[r] | |||
|
1250 | break | |||
|
1251 | for r in reversed(newrevs): | |||
|
1252 | if not unfi[r].obsolete(): | |||
|
1253 | maxrev = repo[r] | |||
|
1254 | break | |||
|
1255 | ||||
|
1256 | if minrev is None or maxrev is None: | |||
|
1257 | # Got only obsoletes. | |||
|
1258 | return | |||
|
1259 | ||||
|
1260 | if minrev == maxrev: | |||
|
1261 | revrange = minrev | |||
|
1262 | else: | |||
|
1263 | revrange = '%s:%s' % (minrev, maxrev) | |||
|
1264 | repo.ui.status(_('new changesets %s\n') % revrange) |
@@ -67,6 +67,7 b'' | |||||
67 | adding manifests |
|
67 | adding manifests | |
68 | adding file changes |
|
68 | adding file changes | |
69 | added 1 changesets with 3 changes to 3 files |
|
69 | added 1 changesets with 3 changes to 3 files | |
|
70 | new changesets 6675d58eff77 | |||
70 | updating to branch default |
|
71 | updating to branch default | |
71 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
72 |
|
73 | |||
@@ -1416,6 +1417,7 b' Branch acl tests setup' | |||||
1416 | adding manifests |
|
1417 | adding manifests | |
1417 | adding file changes |
|
1418 | adding file changes | |
1418 | added 2 changesets with 1 changes to 1 files (+1 heads) |
|
1419 | added 2 changesets with 1 changes to 1 files (+1 heads) | |
|
1420 | new changesets 81fbf4469322:fb35475503ef | |||
1419 | (run 'hg heads' to see heads) |
|
1421 | (run 'hg heads' to see heads) | |
1420 |
|
1422 | |||
1421 | Create additional changeset on foobar branch |
|
1423 | Create additional changeset on foobar branch |
@@ -78,6 +78,7 b' unbundle tampered bundle' | |||||
78 | adding manifests |
|
78 | adding manifests | |
79 | adding file changes |
|
79 | adding file changes | |
80 | added 5 changesets with 6 changes to 6 files (+4 heads) |
|
80 | added 5 changesets with 6 changes to 6 files (+4 heads) | |
|
81 | new changesets b7da9bf6b037:fc1393d727bc | |||
81 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
82 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
82 |
|
83 | |||
83 | attack .hg/test |
|
84 | attack .hg/test |
@@ -66,6 +66,7 b' clone, commit, pull' | |||||
66 | adding manifests |
|
66 | adding manifests | |
67 | adding file changes |
|
67 | adding file changes | |
68 | added 1 changesets with 1 changes to 1 files |
|
68 | added 1 changesets with 1 changes to 1 files | |
|
69 | new changesets d02f48003e62 | |||
69 | (run 'hg update' to get a working copy) |
|
70 | (run 'hg update' to get a working copy) | |
70 | $ hg blackbox -l 6 |
|
71 | $ hg blackbox -l 6 | |
71 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull |
|
72 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull | |
@@ -109,6 +110,7 b' we must not cause a failure if we cannot' | |||||
109 | adding manifests |
|
110 | adding manifests | |
110 | adding file changes |
|
111 | adding file changes | |
111 | added 1 changesets with 1 changes to 1 files |
|
112 | added 1 changesets with 1 changes to 1 files | |
|
113 | new changesets d02f48003e62 | |||
112 | (run 'hg update' to get a working copy) |
|
114 | (run 'hg update' to get a working copy) | |
113 |
|
115 | |||
114 | a failure reading from the log is fatal |
|
116 | a failure reading from the log is fatal |
@@ -40,6 +40,7 b' import bookmark by name' | |||||
40 | adding remote bookmark X |
|
40 | adding remote bookmark X | |
41 | updating bookmark Y |
|
41 | updating bookmark Y | |
42 | adding remote bookmark Z |
|
42 | adding remote bookmark Z | |
|
43 | new changesets 4e3505fd9583 | |||
43 | (run 'hg update' to get a working copy) |
|
44 | (run 'hg update' to get a working copy) | |
44 | $ hg bookmarks |
|
45 | $ hg bookmarks | |
45 | X 0:4e3505fd9583 |
|
46 | X 0:4e3505fd9583 | |
@@ -190,6 +191,7 b' divergent bookmarks' | |||||
190 | divergent bookmark @ stored as @foo |
|
191 | divergent bookmark @ stored as @foo | |
191 | divergent bookmark X stored as X@foo |
|
192 | divergent bookmark X stored as X@foo | |
192 | updating bookmark Z |
|
193 | updating bookmark Z | |
|
194 | new changesets 0d2164f0ce0d | |||
193 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
195 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
194 | $ hg book |
|
196 | $ hg book | |
195 | @ 1:9b140be10808 |
|
197 | @ 1:9b140be10808 | |
@@ -343,6 +345,7 b' race conditions' | |||||
343 | adding file changes |
|
345 | adding file changes | |
344 | added 1 changesets with 1 changes to 1 files |
|
346 | added 1 changesets with 1 changes to 1 files | |
345 | updating bookmark Y |
|
347 | updating bookmark Y | |
|
348 | new changesets b0a5eff05604 | |||
346 | (run 'hg update' to get a working copy) |
|
349 | (run 'hg update' to get a working copy) | |
347 | $ hg book |
|
350 | $ hg book | |
348 | * @ 1:0d2164f0ce0d |
|
351 | * @ 1:0d2164f0ce0d | |
@@ -392,6 +395,7 b' Update a bookmark right after the initia' | |||||
392 | adding file changes |
|
395 | adding file changes | |
393 | added 1 changesets with 1 changes to 1 files |
|
396 | added 1 changesets with 1 changes to 1 files | |
394 | updating bookmark Y |
|
397 | updating bookmark Y | |
|
398 | new changesets 35d1ef0a8d1b | |||
395 | (run 'hg update' to get a working copy) |
|
399 | (run 'hg update' to get a working copy) | |
396 | $ hg book |
|
400 | $ hg book | |
397 | @ 1:0d2164f0ce0d |
|
401 | @ 1:0d2164f0ce0d | |
@@ -555,6 +559,7 b' hgweb' | |||||
555 | adding file changes |
|
559 | adding file changes | |
556 | added 5 changesets with 5 changes to 3 files (+2 heads) |
|
560 | added 5 changesets with 5 changes to 3 files (+2 heads) | |
557 | 2 new obsolescence markers |
|
561 | 2 new obsolescence markers | |
|
562 | new changesets 4e3505fd9583:c922c0139ca0 | |||
558 | updating to bookmark @ |
|
563 | updating to bookmark @ | |
559 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
564 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
560 | $ hg -R cloned-bookmarks bookmarks |
|
565 | $ hg -R cloned-bookmarks bookmarks | |
@@ -691,6 +696,7 b' bookmark, not all outgoing changes:' | |||||
691 | adding file changes |
|
696 | adding file changes | |
692 | added 5 changesets with 5 changes to 3 files (+2 heads) |
|
697 | added 5 changesets with 5 changes to 3 files (+2 heads) | |
693 | 2 new obsolescence markers |
|
698 | 2 new obsolescence markers | |
|
699 | new changesets 4e3505fd9583:c922c0139ca0 | |||
694 | updating to bookmark @ |
|
700 | updating to bookmark @ | |
695 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
701 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
696 | $ cd addmarks |
|
702 | $ cd addmarks |
@@ -550,6 +550,7 b' test clone with pull protocol' | |||||
550 | adding manifests |
|
550 | adding manifests | |
551 | adding file changes |
|
551 | adding file changes | |
552 | added 3 changesets with 3 changes to 3 files (+1 heads) |
|
552 | added 3 changesets with 3 changes to 3 files (+1 heads) | |
|
553 | new changesets f7b1eb17ad24:db815d6d32e6 | |||
553 | updating to bookmark @ |
|
554 | updating to bookmark @ | |
554 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
555 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
555 | $ hg -R cloned-bookmarks-pull bookmarks |
|
556 | $ hg -R cloned-bookmarks-pull bookmarks | |
@@ -587,6 +588,7 b' test clone with a specific revision' | |||||
587 | adding manifests |
|
588 | adding manifests | |
588 | adding file changes |
|
589 | adding file changes | |
589 | added 2 changesets with 2 changes to 2 files |
|
590 | added 2 changesets with 2 changes to 2 files | |
|
591 | new changesets f7b1eb17ad24:925d80f479bb | |||
590 | updating to branch default |
|
592 | updating to branch default | |
591 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
593 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
592 | $ hg -R cloned-bookmarks-rev bookmarks |
|
594 | $ hg -R cloned-bookmarks-rev bookmarks | |
@@ -627,6 +629,7 b' create bundle with two heads' | |||||
627 | adding manifests |
|
629 | adding manifests | |
628 | adding file changes |
|
630 | adding file changes | |
629 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
631 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
632 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |||
630 |
|
|
633 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
631 |
|
634 | |||
632 | update to active bookmark if it's not the parent |
|
635 | update to active bookmark if it's not the parent | |
@@ -674,6 +677,7 b' pull --update works the same as pull && ' | |||||
674 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
677 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
675 | updating bookmark Y |
|
678 | updating bookmark Y | |
676 | updating bookmark Z |
|
679 | updating bookmark Z | |
|
680 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |||
677 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
681 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
678 |
|
682 | |||
679 | (# tests strange but with --date crashing when bookmark have to move) |
|
683 | (# tests strange but with --date crashing when bookmark have to move) | |
@@ -699,6 +703,7 b' pull --update works the same as pull && ' | |||||
699 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
703 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
700 | updating bookmark Y |
|
704 | updating bookmark Y | |
701 | updating bookmark Z |
|
705 | updating bookmark Z | |
|
706 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |||
702 | updating to active bookmark Y |
|
707 | updating to active bookmark Y | |
703 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
708 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
704 |
|
709 | |||
@@ -723,6 +728,7 b' We warn about divergent during bare upda' | |||||
723 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
728 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
724 | updating bookmark Y |
|
729 | updating bookmark Y | |
725 | updating bookmark Z |
|
730 | updating bookmark Z | |
|
731 | new changesets 125c9a1d6df6:9ba5f110a0b3 | |||
726 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
732 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
727 | $ hg -R ../cloned-bookmarks-manual-update-with-divergence update |
|
733 | $ hg -R ../cloned-bookmarks-manual-update-with-divergence update | |
728 | updating to active bookmark Y |
|
734 | updating to active bookmark Y | |
@@ -907,6 +913,7 b' case)' | |||||
907 | adding remote bookmark foo |
|
913 | adding remote bookmark foo | |
908 | adding remote bookmark four |
|
914 | adding remote bookmark four | |
909 | adding remote bookmark should-end-on-two |
|
915 | adding remote bookmark should-end-on-two | |
|
916 | new changesets 5fb12f0f2d51 | |||
910 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
917 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
911 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
|
918 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" | |
912 | 3:125c9a1d6df6 |
|
919 | 3:125c9a1d6df6 | |
@@ -930,6 +937,7 b' updates the working directory and curren' | |||||
930 | adding file changes |
|
937 | adding file changes | |
931 | added 1 changesets with 1 changes to 1 files |
|
938 | added 1 changesets with 1 changes to 1 files | |
932 | divergent bookmark Z stored as Z@default |
|
939 | divergent bookmark Z stored as Z@default | |
|
940 | new changesets 81dcce76aa0b | |||
933 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
941 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
934 | updating bookmark Y |
|
942 | updating bookmark Y | |
935 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
|
943 | $ hg -R ../cloned-bookmarks-update parents -T "{rev}:{node|short}\n" |
@@ -23,6 +23,7 b' test branch selection options' | |||||
23 | adding manifests |
|
23 | adding manifests | |
24 | adding file changes |
|
24 | adding file changes | |
25 | added 1 changesets with 1 changes to 1 files |
|
25 | added 1 changesets with 1 changes to 1 files | |
|
26 | new changesets 5b65ba7c951d | |||
26 | updating to branch a |
|
27 | updating to branch a | |
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | $ cd branch2 |
|
29 | $ cd branch2 | |
@@ -101,6 +102,7 b' clone branch b' | |||||
101 | adding manifests |
|
102 | adding manifests | |
102 | adding file changes |
|
103 | adding file changes | |
103 | added 3 changesets with 3 changes to 1 files (+1 heads) |
|
104 | added 3 changesets with 3 changes to 1 files (+1 heads) | |
|
105 | new changesets 5b65ba7c951d:65511d0e2b55 | |||
104 | updating to branch b |
|
106 | updating to branch b | |
105 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
107 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
106 | $ hg -q -R branch3 heads b |
|
108 | $ hg -q -R branch3 heads b | |
@@ -117,6 +119,7 b' clone rev a branch b' | |||||
117 | adding manifests |
|
119 | adding manifests | |
118 | adding file changes |
|
120 | adding file changes | |
119 | added 3 changesets with 3 changes to 1 files (+1 heads) |
|
121 | added 3 changesets with 3 changes to 1 files (+1 heads) | |
|
122 | new changesets 5b65ba7c951d:65511d0e2b55 | |||
120 | updating to branch a |
|
123 | updating to branch a | |
121 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 | $ hg -q -R branch3 heads b |
|
125 | $ hg -q -R branch3 heads b |
@@ -93,6 +93,7 b' verify update will accept invalid legacy' | |||||
93 | adding manifests |
|
93 | adding manifests | |
94 | adding file changes |
|
94 | adding file changes | |
95 | added 3 changesets with 3 changes to 2 files |
|
95 | added 3 changesets with 3 changes to 2 files | |
|
96 | new changesets f0e4c7f04036:33c2ceb9310b | |||
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 |
|
98 | |||
98 | $ hg update '"colon:test"' |
|
99 | $ hg update '"colon:test"' |
@@ -5,6 +5,7 b'' | |||||
5 | adding manifests |
|
5 | adding manifests | |
6 | adding file changes |
|
6 | adding file changes | |
7 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
7 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
8 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
8 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
9 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
9 | $ hg up tip |
|
10 | $ hg up tip | |
10 | 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 | |
@@ -26,6 +27,7 b'' | |||||
26 | adding manifests |
|
27 | adding manifests | |
27 | adding file changes |
|
28 | adding file changes | |
28 | added 1 changesets with 1 changes to 1 files |
|
29 | added 1 changesets with 1 changes to 1 files | |
|
30 | new changesets bfaf4b5cbf01 | |||
29 | (run 'hg update' to get a working copy) |
|
31 | (run 'hg update' to get a working copy) | |
30 | checking changesets |
|
32 | checking changesets | |
31 | checking manifests |
|
33 | checking manifests | |
@@ -39,6 +41,7 b'' | |||||
39 | adding manifests |
|
41 | adding manifests | |
40 | adding file changes |
|
42 | adding file changes | |
41 | added 2 changesets with 2 changes to 1 files |
|
43 | added 2 changesets with 2 changes to 1 files | |
|
44 | new changesets bfaf4b5cbf01:21f32785131f | |||
42 | (run 'hg update' to get a working copy) |
|
45 | (run 'hg update' to get a working copy) | |
43 | checking changesets |
|
46 | checking changesets | |
44 | checking manifests |
|
47 | checking manifests | |
@@ -52,6 +55,7 b'' | |||||
52 | adding manifests |
|
55 | adding manifests | |
53 | adding file changes |
|
56 | adding file changes | |
54 | added 3 changesets with 3 changes to 1 files |
|
57 | added 3 changesets with 3 changes to 1 files | |
|
58 | new changesets bfaf4b5cbf01:4ce51a113780 | |||
55 | (run 'hg update' to get a working copy) |
|
59 | (run 'hg update' to get a working copy) | |
56 | checking changesets |
|
60 | checking changesets | |
57 | checking manifests |
|
61 | checking manifests | |
@@ -65,6 +69,7 b'' | |||||
65 | adding manifests |
|
69 | adding manifests | |
66 | adding file changes |
|
70 | adding file changes | |
67 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
|
72 | new changesets bfaf4b5cbf01:93ee6ab32777 | |||
68 | (run 'hg update' to get a working copy) |
|
73 | (run 'hg update' to get a working copy) | |
69 | checking changesets |
|
74 | checking changesets | |
70 | checking manifests |
|
75 | checking manifests | |
@@ -78,6 +83,7 b'' | |||||
78 | adding manifests |
|
83 | adding manifests | |
79 | adding file changes |
|
84 | adding file changes | |
80 | added 2 changesets with 2 changes to 1 files |
|
85 | added 2 changesets with 2 changes to 1 files | |
|
86 | new changesets bfaf4b5cbf01:c70afb1ee985 | |||
81 | (run 'hg update' to get a working copy) |
|
87 | (run 'hg update' to get a working copy) | |
82 | checking changesets |
|
88 | checking changesets | |
83 | checking manifests |
|
89 | checking manifests | |
@@ -91,6 +97,7 b'' | |||||
91 | adding manifests |
|
97 | adding manifests | |
92 | adding file changes |
|
98 | adding file changes | |
93 | added 3 changesets with 3 changes to 1 files |
|
99 | added 3 changesets with 3 changes to 1 files | |
|
100 | new changesets bfaf4b5cbf01:f03ae5a9b979 | |||
94 | (run 'hg update' to get a working copy) |
|
101 | (run 'hg update' to get a working copy) | |
95 | checking changesets |
|
102 | checking changesets | |
96 | checking manifests |
|
103 | checking manifests | |
@@ -104,6 +111,7 b'' | |||||
104 | adding manifests |
|
111 | adding manifests | |
105 | adding file changes |
|
112 | adding file changes | |
106 | added 4 changesets with 5 changes to 2 files |
|
113 | added 4 changesets with 5 changes to 2 files | |
|
114 | new changesets bfaf4b5cbf01:095cb14b1b4d | |||
107 | (run 'hg update' to get a working copy) |
|
115 | (run 'hg update' to get a working copy) | |
108 | checking changesets |
|
116 | checking changesets | |
109 | checking manifests |
|
117 | checking manifests | |
@@ -117,6 +125,7 b'' | |||||
117 | adding manifests |
|
125 | adding manifests | |
118 | adding file changes |
|
126 | adding file changes | |
119 | added 5 changesets with 6 changes to 3 files |
|
127 | added 5 changesets with 6 changes to 3 files | |
|
128 | new changesets bfaf4b5cbf01:faa2e4234c7a | |||
120 | (run 'hg update' to get a working copy) |
|
129 | (run 'hg update' to get a working copy) | |
121 | checking changesets |
|
130 | checking changesets | |
122 | checking manifests |
|
131 | checking manifests | |
@@ -130,6 +139,7 b'' | |||||
130 | adding manifests |
|
139 | adding manifests | |
131 | adding file changes |
|
140 | adding file changes | |
132 | added 5 changesets with 5 changes to 2 files |
|
141 | added 5 changesets with 5 changes to 2 files | |
|
142 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
133 | (run 'hg update' to get a working copy) |
|
143 | (run 'hg update' to get a working copy) | |
134 | checking changesets |
|
144 | checking changesets | |
135 | checking manifests |
|
145 | checking manifests | |
@@ -145,6 +155,7 b'' | |||||
145 | adding manifests |
|
155 | adding manifests | |
146 | adding file changes |
|
156 | adding file changes | |
147 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
157 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
|
158 | new changesets c70afb1ee985:faa2e4234c7a | |||
148 |
|
|
159 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
149 | $ hg verify |
|
160 | $ hg verify | |
150 | checking changesets |
|
161 | checking changesets | |
@@ -223,6 +234,7 b' revision 2' | |||||
223 | adding manifests |
|
234 | adding manifests | |
224 | adding file changes |
|
235 | adding file changes | |
225 | added 6 changesets with 4 changes to 4 files (+1 heads) |
|
236 | added 6 changesets with 4 changes to 4 files (+1 heads) | |
|
237 | new changesets 93ee6ab32777:916f1afdef90 | |||
226 |
|
|
238 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
227 |
|
239 | |||
228 | revision 8 |
|
240 | revision 8 | |
@@ -247,6 +259,7 b' revision 2' | |||||
247 | adding manifests |
|
259 | adding manifests | |
248 | adding file changes |
|
260 | adding file changes | |
249 | added 2 changesets with 2 changes to 2 files |
|
261 | added 2 changesets with 2 changes to 2 files | |
|
262 | new changesets 93ee6ab32777:916f1afdef90 | |||
250 | (run 'hg update' to get a working copy) |
|
263 | (run 'hg update' to get a working copy) | |
251 |
|
264 | |||
252 | revision 4 |
|
265 | revision 4 | |
@@ -266,6 +279,7 b' revision 4' | |||||
266 | adding manifests |
|
279 | adding manifests | |
267 | adding file changes |
|
280 | adding file changes | |
268 | added 4 changesets with 3 changes to 3 files (+1 heads) |
|
281 | added 4 changesets with 3 changes to 3 files (+1 heads) | |
|
282 | new changesets c70afb1ee985:faa2e4234c7a | |||
269 |
|
|
283 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
270 |
|
284 | |||
271 | revision 6 |
|
285 | revision 6 | |
@@ -285,6 +299,7 b' revision 6' | |||||
285 | adding manifests |
|
299 | adding manifests | |
286 | adding file changes |
|
300 | adding file changes | |
287 | added 2 changesets with 2 changes to 2 files |
|
301 | added 2 changesets with 2 changes to 2 files | |
|
302 | new changesets 93ee6ab32777:916f1afdef90 | |||
288 | (run 'hg update' to get a working copy) |
|
303 | (run 'hg update' to get a working copy) | |
289 |
|
304 | |||
290 | revision 4 |
|
305 | revision 4 | |
@@ -318,6 +333,7 b' revision 4' | |||||
318 | adding manifests |
|
333 | adding manifests | |
319 | adding file changes |
|
334 | adding file changes | |
320 | added 7 changesets with 4 changes to 4 files |
|
335 | added 7 changesets with 4 changes to 4 files | |
|
336 | new changesets 93ee6ab32777:03fc0b0e347c | |||
321 | (run 'hg update' to get a working copy) |
|
337 | (run 'hg update' to get a working copy) | |
322 |
|
338 | |||
323 | revision 9 |
|
339 | revision 9 |
@@ -26,6 +26,7 b' bundle w/o type option' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 1 changesets with 1 changes to 1 files |
|
28 | added 1 changesets with 1 changes to 1 files | |
|
29 | new changesets c35a0f9217e6 | |||
29 | (run 'hg update' to get a working copy) |
|
30 | (run 'hg update' to get a working copy) | |
30 | $ hg up |
|
31 | $ hg up | |
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -106,6 +106,7 b' sanity check of outgoing: expect revs 4 ' | |||||
106 | adding manifests |
|
106 | adding manifests | |
107 | adding file changes |
|
107 | adding file changes | |
108 | added 4 changesets with 4 changes to 1 files |
|
108 | added 4 changesets with 4 changes to 1 files | |
|
109 | new changesets 6ae4cca4e39a:478f191e53f8 | |||
109 | updating to branch default |
|
110 | updating to branch default | |
110 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
111 |
|
112 |
@@ -104,6 +104,7 b' Pull full.hg into empty (using --cwd)' | |||||
104 | adding manifests |
|
104 | adding manifests | |
105 | adding file changes |
|
105 | adding file changes | |
106 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
106 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
107 | new changesets f9ee2f85a263:aa35859c02ea | |||
107 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
108 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
108 |
|
109 | |||
109 | Rollback empty |
|
110 | Rollback empty | |
@@ -120,6 +121,7 b' Pull full.hg into empty again (using --c' | |||||
120 | adding manifests |
|
121 | adding manifests | |
121 | adding file changes |
|
122 | adding file changes | |
122 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
123 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
124 | new changesets f9ee2f85a263:aa35859c02ea | |||
123 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
125 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
124 |
|
126 | |||
125 | Pull full.hg into test (using -R) |
|
127 | Pull full.hg into test (using -R) | |
@@ -150,6 +152,7 b' Pull full.hg into empty again (using -R)' | |||||
150 | adding manifests |
|
152 | adding manifests | |
151 | adding file changes |
|
153 | adding file changes | |
152 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
154 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
155 | new changesets f9ee2f85a263:aa35859c02ea | |||
153 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
156 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
154 |
|
157 | |||
155 | Log -R full.hg in fresh empty |
|
158 | Log -R full.hg in fresh empty | |
@@ -232,6 +235,7 b' hg -R bundle://../full.hg verify' | |||||
232 | adding manifests |
|
235 | adding manifests | |
233 | adding file changes |
|
236 | adding file changes | |
234 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
237 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
238 | new changesets f9ee2f85a263:aa35859c02ea | |||
235 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle*../full.hg (glob) |
|
239 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle*../full.hg (glob) | |
236 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
240 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
237 |
|
241 | |||
@@ -255,6 +259,7 b' Pull full.hg into empty again (using -R;' | |||||
255 | adding manifests |
|
259 | adding manifests | |
256 | adding file changes |
|
260 | adding file changes | |
257 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
261 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
262 | new changesets f9ee2f85a263:aa35859c02ea | |||
258 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg |
|
263 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=bundle:empty+full.hg | |
259 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
264 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
260 |
|
265 | |||
@@ -387,6 +392,7 b' Create partial clones' | |||||
387 | adding manifests |
|
392 | adding manifests | |
388 | adding file changes |
|
393 | adding file changes | |
389 | added 4 changesets with 4 changes to 1 files |
|
394 | added 4 changesets with 4 changes to 1 files | |
|
395 | new changesets f9ee2f85a263:eebf5a27f8ca | |||
390 | updating to branch default |
|
396 | updating to branch default | |
391 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
397 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
392 | $ hg clone partial partial2 |
|
398 | $ hg clone partial partial2 | |
@@ -541,6 +547,7 b' Direct clone from bundle (all-history)' | |||||
541 | adding manifests |
|
547 | adding manifests | |
542 | adding file changes |
|
548 | adding file changes | |
543 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
549 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
550 | new changesets f9ee2f85a263:aa35859c02ea | |||
544 | updating to branch default |
|
551 | updating to branch default | |
545 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
552 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
546 | $ hg -R full-clone heads |
|
553 | $ hg -R full-clone heads | |
@@ -580,10 +587,12 b' Unbundle incremental bundles into fresh ' | |||||
580 | adding manifests |
|
587 | adding manifests | |
581 | adding file changes |
|
588 | adding file changes | |
582 | added 1 changesets with 1 changes to 1 files |
|
589 | added 1 changesets with 1 changes to 1 files | |
|
590 | new changesets f9ee2f85a263 | |||
583 | adding changesets |
|
591 | adding changesets | |
584 | adding manifests |
|
592 | adding manifests | |
585 | adding file changes |
|
593 | adding file changes | |
586 | added 1 changesets with 1 changes to 1 files |
|
594 | added 1 changesets with 1 changes to 1 files | |
|
595 | new changesets 34c2bf6b0626 | |||
587 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
596 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
588 |
|
597 | |||
589 | View full contents of the bundle |
|
598 | View full contents of the bundle |
@@ -49,6 +49,7 b' The extension requires a repo (currently' | |||||
49 | adding file changes |
|
49 | adding file changes | |
50 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
50 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
51 | pre-close-tip:02de42196ebe draft |
|
51 | pre-close-tip:02de42196ebe draft | |
|
52 | new changesets cd010b8cd998:02de42196ebe | |||
52 | postclose-tip:02de42196ebe draft |
|
53 | postclose-tip:02de42196ebe draft | |
53 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle |
|
54 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle | |
54 | bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) |
|
55 | bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) | |
@@ -83,6 +84,7 b' clone --pull' | |||||
83 | added 2 changesets with 2 changes to 2 files |
|
84 | added 2 changesets with 2 changes to 2 files | |
84 | 1 new obsolescence markers |
|
85 | 1 new obsolescence markers | |
85 | pre-close-tip:9520eea781bc draft |
|
86 | pre-close-tip:9520eea781bc draft | |
|
87 | new changesets cd010b8cd998:9520eea781bc | |||
86 | postclose-tip:9520eea781bc draft |
|
88 | postclose-tip:9520eea781bc draft | |
87 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull |
|
89 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | |
88 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
90 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
@@ -111,6 +113,7 b' pull' | |||||
111 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
113 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
112 | 1 new obsolescence markers |
|
114 | 1 new obsolescence markers | |
113 | pre-close-tip:24b6387c8c8c draft |
|
115 | pre-close-tip:24b6387c8c8c draft | |
|
116 | new changesets 24b6387c8c8c | |||
114 | postclose-tip:24b6387c8c8c draft |
|
117 | postclose-tip:24b6387c8c8c draft | |
115 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull |
|
118 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | |
116 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
119 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
@@ -288,6 +291,7 b' pull over ssh' | |||||
288 | 1 new obsolescence markers |
|
291 | 1 new obsolescence markers | |
289 | updating bookmark book_02de |
|
292 | updating bookmark book_02de | |
290 | pre-close-tip:02de42196ebe draft book_02de |
|
293 | pre-close-tip:02de42196ebe draft book_02de | |
|
294 | new changesets 02de42196ebe | |||
291 | postclose-tip:02de42196ebe draft book_02de |
|
295 | postclose-tip:02de42196ebe draft book_02de | |
292 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull |
|
296 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | |
293 | ssh://user@dummy/main HG_URL=ssh://user@dummy/main |
|
297 | ssh://user@dummy/main HG_URL=ssh://user@dummy/main | |
@@ -313,6 +317,7 b' pull over http' | |||||
313 | 1 new obsolescence markers |
|
317 | 1 new obsolescence markers | |
314 | updating bookmark book_42cc |
|
318 | updating bookmark book_42cc | |
315 | pre-close-tip:42ccdea3bb16 draft book_42cc |
|
319 | pre-close-tip:42ccdea3bb16 draft book_42cc | |
|
320 | new changesets 42ccdea3bb16 | |||
316 | postclose-tip:42ccdea3bb16 draft book_42cc |
|
321 | postclose-tip:42ccdea3bb16 draft book_42cc | |
317 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull |
|
322 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | |
318 | http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/ |
|
323 | http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/ | |
@@ -998,6 +1003,7 b' bundle1 can still pull non-generaldelta ' | |||||
998 | adding manifests |
|
1003 | adding manifests | |
999 | adding file changes |
|
1004 | adding file changes | |
1000 | added 1 changesets with 1 changes to 1 files |
|
1005 | added 1 changesets with 1 changes to 1 files | |
|
1006 | new changesets 96ee1d7354c4 | |||
1001 | updating to branch default |
|
1007 | updating to branch default | |
1002 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1008 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1003 |
|
1009 | |||
@@ -1079,6 +1085,7 b' Verify the global server.bundle1 option ' | |||||
1079 | adding manifests |
|
1085 | adding manifests | |
1080 | adding file changes |
|
1086 | adding file changes | |
1081 | added 1 changesets with 1 changes to 1 files |
|
1087 | added 1 changesets with 1 changes to 1 files | |
|
1088 | new changesets 96ee1d7354c4 | |||
1082 | updating to branch default |
|
1089 | updating to branch default | |
1083 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1090 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1084 |
|
1091 | |||
@@ -1105,6 +1112,7 b' Verify bundle1 pushes can be disabled' | |||||
1105 | adding manifests |
|
1112 | adding manifests | |
1106 | adding file changes |
|
1113 | adding file changes | |
1107 | added 1 changesets with 1 changes to 1 files |
|
1114 | added 1 changesets with 1 changes to 1 files | |
|
1115 | new changesets 96ee1d7354c4 | |||
1108 | updating to branch default |
|
1116 | updating to branch default | |
1109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1110 | $ cd bundle2-only |
|
1118 | $ cd bundle2-only |
@@ -835,6 +835,7 b' Support for changegroup' | |||||
835 | adding manifests |
|
835 | adding manifests | |
836 | adding file changes |
|
836 | adding file changes | |
837 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
837 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
|
838 | new changesets cd010b8cd998:02de42196ebe | |||
838 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
839 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
839 |
|
840 | |||
840 | $ hg log -G |
|
841 | $ hg log -G |
@@ -88,6 +88,7 b' Pull the new commits in the clone' | |||||
88 | adding file changes |
|
88 | adding file changes | |
89 | added 1 changesets with 1 changes to 1 files |
|
89 | added 1 changesets with 1 changes to 1 files | |
90 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
90 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
|
91 | new changesets 27547f69f254:f838bfaca5c7 | |||
91 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
92 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
92 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
93 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
93 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
94 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
@@ -158,6 +159,7 b' pullop.cgresult' | |||||
158 | adding file changes |
|
159 | adding file changes | |
159 | added 3 changesets with 3 changes to 3 files (+1 heads) |
|
160 | added 3 changesets with 3 changes to 3 files (+1 heads) | |
160 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
161 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46 HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
|
162 | new changesets b3325c91a4d9:5cd59d311f65 | |||
161 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
163 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
162 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
164 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
163 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
165 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
@@ -231,6 +233,7 b' pullop.cgresult' | |||||
231 | adding file changes |
|
233 | adding file changes | |
232 | added 1 changesets with 1 changes to 1 files |
|
234 | added 1 changesets with 1 changes to 1 files | |
233 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
235 | pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup HG_HOOKTYPE=pretxnchangegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PENDING=$TESTTMP/clone HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
|
236 | new changesets 71bd7b46de72:9d18e5bd9ab0 | |||
234 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
237 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
235 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
238 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo | |
236 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
|
239 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/repo |
@@ -91,6 +91,7 b' Start a simple HTTP server to serve bund' | |||||
91 | adding manifests |
|
91 | adding manifests | |
92 | adding file changes |
|
92 | adding file changes | |
93 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
93 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
94 | new changesets cd010b8cd998:02de42196ebe | |||
94 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
95 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
95 |
|
96 | |||
96 | $ hg -R repo log -G |
|
97 | $ hg -R repo log -G | |
@@ -131,6 +132,7 b' Test a pull with an remote-changegroup' | |||||
131 | adding manifests |
|
132 | adding manifests | |
132 | adding file changes |
|
133 | adding file changes | |
133 | added 5 changesets with 5 changes to 5 files (+1 heads) |
|
134 | added 5 changesets with 5 changes to 5 files (+1 heads) | |
|
135 | new changesets cd010b8cd998:9520eea781bc | |||
134 | updating to branch default |
|
136 | updating to branch default | |
135 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
137 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
136 | $ hg pull -R clone ssh://user@dummy/repo |
|
138 | $ hg pull -R clone ssh://user@dummy/repo | |
@@ -141,6 +143,7 b' Test a pull with an remote-changegroup' | |||||
141 | adding manifests |
|
143 | adding manifests | |
142 | adding file changes |
|
144 | adding file changes | |
143 | added 3 changesets with 2 changes to 2 files (+1 heads) |
|
145 | added 3 changesets with 2 changes to 2 files (+1 heads) | |
|
146 | new changesets 24b6387c8c8c:02de42196ebe | |||
144 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
147 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
145 | $ hg -R clone log -G |
|
148 | $ hg -R clone log -G | |
146 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
|
149 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
@@ -174,6 +177,7 b' Test a pull with an remote-changegroup a' | |||||
174 | adding manifests |
|
177 | adding manifests | |
175 | adding file changes |
|
178 | adding file changes | |
176 | added 3 changesets with 3 changes to 3 files |
|
179 | added 3 changesets with 3 changes to 3 files | |
|
180 | new changesets cd010b8cd998:5fddd98957c8 | |||
177 | updating to branch default |
|
181 | updating to branch default | |
178 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
182 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
179 | $ hg pull -R clone ssh://user@dummy/repo |
|
183 | $ hg pull -R clone ssh://user@dummy/repo | |
@@ -189,6 +193,7 b' Test a pull with an remote-changegroup a' | |||||
189 | adding manifests |
|
193 | adding manifests | |
190 | adding file changes |
|
194 | adding file changes | |
191 | added 3 changesets with 2 changes to 2 files (+1 heads) |
|
195 | added 3 changesets with 2 changes to 2 files (+1 heads) | |
|
196 | new changesets 32af7686d403:02de42196ebe | |||
192 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
197 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
193 | $ hg -R clone log -G |
|
198 | $ hg -R clone log -G | |
194 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
|
199 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
@@ -222,6 +227,7 b' Test a pull with a changegroup followed ' | |||||
222 | adding manifests |
|
227 | adding manifests | |
223 | adding file changes |
|
228 | adding file changes | |
224 | added 3 changesets with 3 changes to 3 files |
|
229 | added 3 changesets with 3 changes to 3 files | |
|
230 | new changesets cd010b8cd998:5fddd98957c8 | |||
225 | updating to branch default |
|
231 | updating to branch default | |
226 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
232 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
227 | $ hg pull -R clone ssh://user@dummy/repo |
|
233 | $ hg pull -R clone ssh://user@dummy/repo | |
@@ -237,6 +243,7 b' Test a pull with a changegroup followed ' | |||||
237 | adding manifests |
|
243 | adding manifests | |
238 | adding file changes |
|
244 | adding file changes | |
239 | added 3 changesets with 2 changes to 2 files (+1 heads) |
|
245 | added 3 changesets with 2 changes to 2 files (+1 heads) | |
|
246 | new changesets 32af7686d403:02de42196ebe | |||
240 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
247 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
241 | $ hg -R clone log -G |
|
248 | $ hg -R clone log -G | |
242 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
|
249 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
@@ -273,6 +280,7 b' Test a pull with two remote-changegroups' | |||||
273 | adding manifests |
|
280 | adding manifests | |
274 | adding file changes |
|
281 | adding file changes | |
275 | added 3 changesets with 3 changes to 3 files |
|
282 | added 3 changesets with 3 changes to 3 files | |
|
283 | new changesets cd010b8cd998:5fddd98957c8 | |||
276 | updating to branch default |
|
284 | updating to branch default | |
277 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
285 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
278 | $ hg pull -R clone ssh://user@dummy/repo |
|
286 | $ hg pull -R clone ssh://user@dummy/repo | |
@@ -293,6 +301,7 b' Test a pull with two remote-changegroups' | |||||
293 | adding manifests |
|
301 | adding manifests | |
294 | adding file changes |
|
302 | adding file changes | |
295 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
303 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
304 | new changesets 32af7686d403:02de42196ebe | |||
296 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
305 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
297 | $ hg -R clone log -G |
|
306 | $ hg -R clone log -G | |
298 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H |
|
307 | o 7:02de42196ebe public Nicolas Dumazet <nicdumz.commits@gmail.com> H | |
@@ -328,6 +337,7 b' Hash digest tests' | |||||
328 | adding manifests |
|
337 | adding manifests | |
329 | adding file changes |
|
338 | adding file changes | |
330 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
339 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
340 | new changesets cd010b8cd998:02de42196ebe | |||
331 | updating to branch default |
|
341 | updating to branch default | |
332 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
342 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
333 | $ rm -rf clone |
|
343 | $ rm -rf clone | |
@@ -342,6 +352,7 b' Hash digest tests' | |||||
342 | adding manifests |
|
352 | adding manifests | |
343 | adding file changes |
|
353 | adding file changes | |
344 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
354 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
355 | new changesets cd010b8cd998:02de42196ebe | |||
345 | updating to branch default |
|
356 | updating to branch default | |
346 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
357 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
347 | $ rm -rf clone |
|
358 | $ rm -rf clone | |
@@ -376,6 +387,7 b' Multiple hash digests can be given' | |||||
376 | adding manifests |
|
387 | adding manifests | |
377 | adding file changes |
|
388 | adding file changes | |
378 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
389 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
390 | new changesets cd010b8cd998:02de42196ebe | |||
379 | updating to branch default |
|
391 | updating to branch default | |
380 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
392 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
381 | $ rm -rf clone |
|
393 | $ rm -rf clone | |
@@ -421,6 +433,7 b' Corruption tests' | |||||
421 | adding manifests |
|
433 | adding manifests | |
422 | adding file changes |
|
434 | adding file changes | |
423 | added 3 changesets with 3 changes to 3 files |
|
435 | added 3 changesets with 3 changes to 3 files | |
|
436 | new changesets cd010b8cd998:5fddd98957c8 | |||
424 | updating to branch default |
|
437 | updating to branch default | |
425 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
438 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
426 |
|
439 |
@@ -359,6 +359,7 b' Repo cloned before tainted content intro' | |||||
359 | adding manifests |
|
359 | adding manifests | |
360 | adding file changes |
|
360 | adding file changes | |
361 | added 11 changesets with 11 changes to 2 files (+1 heads) |
|
361 | added 11 changesets with 11 changes to 2 files (+1 heads) | |
|
362 | new changesets 186fb27560c3:683e4645fded | |||
362 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
363 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
363 | $ hg update 4 |
|
364 | $ hg update 4 | |
364 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
365 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -423,6 +424,7 b' Censored nodes can be bundled up and unb' | |||||
423 | adding manifests |
|
424 | adding manifests | |
424 | adding file changes |
|
425 | adding file changes | |
425 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
426 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
427 | new changesets 075be80ac777:dcbaf17bf3a1 | |||
426 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
428 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
427 | $ hg cat -r $REV target |
|
429 | $ hg cat -r $REV target | |
428 | $ hg cat -r $CLEANREV target |
|
430 | $ hg cat -r $CLEANREV target | |
@@ -450,12 +452,14 b' Censored nodes can be imported on top of' | |||||
450 | adding manifests |
|
452 | adding manifests | |
451 | adding file changes |
|
453 | adding file changes | |
452 | added 8 changesets with 10 changes to 2 files (+1 heads) |
|
454 | added 8 changesets with 10 changes to 2 files (+1 heads) | |
|
455 | new changesets e97f55b2665a:dcbaf17bf3a1 | |||
453 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
456 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
454 | $ hg unbundle splitbundle |
|
457 | $ hg unbundle splitbundle | |
455 | adding changesets |
|
458 | adding changesets | |
456 | adding manifests |
|
459 | adding manifests | |
457 | adding file changes |
|
460 | adding file changes | |
458 | added 6 changesets with 5 changes to 2 files (+1 heads) |
|
461 | added 6 changesets with 5 changes to 2 files (+1 heads) | |
|
462 | new changesets efbe78065929:683e4645fded | |||
459 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
463 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
460 | $ hg update $H2 |
|
464 | $ hg update $H2 | |
461 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
465 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -481,5 +485,6 b' Can import bundle where first revision o' | |||||
481 | adding manifests |
|
485 | adding manifests | |
482 | adding file changes |
|
486 | adding file changes | |
483 | added 1 changesets with 2 changes to 2 files |
|
487 | added 1 changesets with 2 changes to 2 files | |
|
488 | new changesets e97f55b2665a | |||
484 | (run 'hg update' to get a working copy) |
|
489 | (run 'hg update' to get a working copy) | |
485 | $ hg cat -r 0 target |
|
490 | $ hg cat -r 0 target |
@@ -37,6 +37,7 b' start a commit...' | |||||
37 | adding manifests |
|
37 | adding manifests | |
38 | adding file changes |
|
38 | adding file changes | |
39 | added 1 changesets with 1 changes to 1 files |
|
39 | added 1 changesets with 1 changes to 1 files | |
|
40 | new changesets 52998019f625 | |||
40 | (run 'hg update' to get a working copy) |
|
41 | (run 'hg update' to get a working copy) | |
41 |
|
42 | |||
42 | see what happened |
|
43 | see what happened |
@@ -89,6 +89,7 b'' | |||||
89 | adding manifests |
|
89 | adding manifests | |
90 | adding file changes |
|
90 | adding file changes | |
91 | added 1 changesets with 1 changes to 1 files |
|
91 | added 1 changesets with 1 changes to 1 files | |
|
92 | new changesets f9ee2f85a263 | |||
92 | updating to branch default |
|
93 | updating to branch default | |
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 | checking changesets |
|
95 | checking changesets | |
@@ -102,6 +103,7 b'' | |||||
102 | adding manifests |
|
103 | adding manifests | |
103 | adding file changes |
|
104 | adding file changes | |
104 | added 2 changesets with 2 changes to 1 files |
|
105 | added 2 changesets with 2 changes to 1 files | |
|
106 | new changesets f9ee2f85a263:34c2bf6b0626 | |||
105 | updating to branch default |
|
107 | updating to branch default | |
106 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | checking changesets |
|
109 | checking changesets | |
@@ -115,6 +117,7 b'' | |||||
115 | adding manifests |
|
117 | adding manifests | |
116 | adding file changes |
|
118 | adding file changes | |
117 | added 3 changesets with 3 changes to 1 files |
|
119 | added 3 changesets with 3 changes to 1 files | |
|
120 | new changesets f9ee2f85a263:e38ba6f5b7e0 | |||
118 | updating to branch default |
|
121 | updating to branch default | |
119 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
120 | checking changesets |
|
123 | checking changesets | |
@@ -128,6 +131,7 b'' | |||||
128 | adding manifests |
|
131 | adding manifests | |
129 | adding file changes |
|
132 | adding file changes | |
130 | added 4 changesets with 4 changes to 1 files |
|
133 | added 4 changesets with 4 changes to 1 files | |
|
134 | new changesets f9ee2f85a263:eebf5a27f8ca | |||
131 | updating to branch default |
|
135 | updating to branch default | |
132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
136 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 | checking changesets |
|
137 | checking changesets | |
@@ -141,6 +145,7 b'' | |||||
141 | adding manifests |
|
145 | adding manifests | |
142 | adding file changes |
|
146 | adding file changes | |
143 | added 2 changesets with 2 changes to 1 files |
|
147 | added 2 changesets with 2 changes to 1 files | |
|
148 | new changesets f9ee2f85a263:095197eb4973 | |||
144 | updating to branch default |
|
149 | updating to branch default | |
145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
146 | checking changesets |
|
151 | checking changesets | |
@@ -154,6 +159,7 b'' | |||||
154 | adding manifests |
|
159 | adding manifests | |
155 | adding file changes |
|
160 | adding file changes | |
156 | added 3 changesets with 3 changes to 1 files |
|
161 | added 3 changesets with 3 changes to 1 files | |
|
162 | new changesets f9ee2f85a263:1bb50a9436a7 | |||
157 | updating to branch default |
|
163 | updating to branch default | |
158 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
164 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
159 | checking changesets |
|
165 | checking changesets | |
@@ -167,6 +173,7 b'' | |||||
167 | adding manifests |
|
173 | adding manifests | |
168 | adding file changes |
|
174 | adding file changes | |
169 | added 4 changesets with 5 changes to 2 files |
|
175 | added 4 changesets with 5 changes to 2 files | |
|
176 | new changesets f9ee2f85a263:7373c1169842 | |||
170 | updating to branch default |
|
177 | updating to branch default | |
171 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
178 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
172 | checking changesets |
|
179 | checking changesets | |
@@ -180,6 +187,7 b'' | |||||
180 | adding manifests |
|
187 | adding manifests | |
181 | adding file changes |
|
188 | adding file changes | |
182 | added 5 changesets with 6 changes to 3 files |
|
189 | added 5 changesets with 6 changes to 3 files | |
|
190 | new changesets f9ee2f85a263:a6a34bfa0076 | |||
183 | updating to branch default |
|
191 | updating to branch default | |
184 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
192 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
185 | checking changesets |
|
193 | checking changesets | |
@@ -193,6 +201,7 b'' | |||||
193 | adding manifests |
|
201 | adding manifests | |
194 | adding file changes |
|
202 | adding file changes | |
195 | added 5 changesets with 5 changes to 2 files |
|
203 | added 5 changesets with 5 changes to 2 files | |
|
204 | new changesets f9ee2f85a263:aa35859c02ea | |||
196 | updating to branch default |
|
205 | updating to branch default | |
197 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
198 | checking changesets |
|
207 | checking changesets | |
@@ -209,6 +218,7 b'' | |||||
209 | adding manifests |
|
218 | adding manifests | |
210 | adding file changes |
|
219 | adding file changes | |
211 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
220 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
|
221 | new changesets 095197eb4973:a6a34bfa0076 | |||
212 |
|
|
222 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
213 | $ hg verify |
|
223 | $ hg verify | |
214 | checking changesets |
|
224 | checking changesets | |
@@ -237,6 +247,7 b'' | |||||
237 | adding manifests |
|
247 | adding manifests | |
238 | adding file changes |
|
248 | adding file changes | |
239 | added 6 changesets with 6 changes to 3 files |
|
249 | added 6 changesets with 6 changes to 3 files | |
|
250 | new changesets f9ee2f85a263:7100abb79635 | |||
240 | updating to branch foobar |
|
251 | updating to branch foobar | |
241 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
252 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
242 |
|
253 |
@@ -68,6 +68,7 b' Cannot stream clone when there are secre' | |||||
68 | adding manifests |
|
68 | adding manifests | |
69 | adding file changes |
|
69 | adding file changes | |
70 | added 1 changesets with 1 changes to 1 files |
|
70 | added 1 changesets with 1 changes to 1 files | |
|
71 | new changesets 96ee1d7354c4 | |||
71 |
|
72 | |||
72 | $ killdaemons.py |
|
73 | $ killdaemons.py | |
73 |
|
74 | |||
@@ -100,6 +101,7 b' Verify interaction between preferuncompr' | |||||
100 | adding manifests |
|
101 | adding manifests | |
101 | adding file changes |
|
102 | adding file changes | |
102 | added 1 changesets with 1 changes to 1 files |
|
103 | added 1 changesets with 1 changes to 1 files | |
|
104 | new changesets 96ee1d7354c4 | |||
103 |
|
105 | |||
104 | $ killdaemons.py |
|
106 | $ killdaemons.py | |
105 |
|
107 | |||
@@ -129,6 +131,7 b" there is no security so it isn't importa" | |||||
129 | adding manifests |
|
131 | adding manifests | |
130 | adding file changes |
|
132 | adding file changes | |
131 | added 1 changesets with 1 changes to 1 files |
|
133 | added 1 changesets with 1 changes to 1 files | |
|
134 | new changesets 96ee1d7354c4 | |||
132 |
|
135 | |||
133 | Stream clone while repo is changing: |
|
136 | Stream clone while repo is changing: | |
134 |
|
137 |
@@ -29,6 +29,7 b'' | |||||
29 | adding manifests |
|
29 | adding manifests | |
30 | adding file changes |
|
30 | adding file changes | |
31 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
31 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
32 | new changesets 8c68ee086fd0:fcc393352796 | |||
32 | $ rm -rf ../b |
|
33 | $ rm -rf ../b | |
33 |
|
34 | |||
34 | $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other |
|
35 | $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other | |
@@ -36,6 +37,7 b'' | |||||
36 | adding manifests |
|
37 | adding manifests | |
37 | adding file changes |
|
38 | adding file changes | |
38 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
39 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
40 | new changesets 8c68ee086fd0:fcc393352796 | |||
39 | updating to branch mine |
|
41 | updating to branch mine | |
40 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
41 | $ rm -rf ../b |
|
43 | $ rm -rf ../b | |
@@ -45,6 +47,7 b'' | |||||
45 | adding manifests |
|
47 | adding manifests | |
46 | adding file changes |
|
48 | adding file changes | |
47 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
49 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
50 | new changesets 8c68ee086fd0:fcc393352796 | |||
48 | updating to branch default |
|
51 | updating to branch default | |
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 | $ rm -rf ../b |
|
53 | $ rm -rf ../b | |
@@ -54,6 +57,7 b'' | |||||
54 | adding manifests |
|
57 | adding manifests | |
55 | adding file changes |
|
58 | adding file changes | |
56 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
59 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
60 | new changesets 8c68ee086fd0:fcc393352796 | |||
57 | updating to branch mine |
|
61 | updating to branch mine | |
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
62 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | $ rm -rf ../b |
|
63 | $ rm -rf ../b | |
@@ -63,6 +67,7 b'' | |||||
63 | adding manifests |
|
67 | adding manifests | |
64 | adding file changes |
|
68 | adding file changes | |
65 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
69 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
70 | new changesets 8c68ee086fd0:fcc393352796 | |||
66 | updating to branch other |
|
71 | updating to branch other | |
67 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
68 | $ rm -rf ../b |
|
73 | $ rm -rf ../b | |
@@ -74,6 +79,7 b' Test -r mine ... mine is ignored:' | |||||
74 | adding manifests |
|
79 | adding manifests | |
75 | adding file changes |
|
80 | adding file changes | |
76 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
81 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
82 | new changesets 8c68ee086fd0:fcc393352796 | |||
77 | updating to branch other |
|
83 | updating to branch other | |
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 | $ rm -rf ../b |
|
85 | $ rm -rf ../b | |
@@ -83,6 +89,7 b' Test -r mine ... mine is ignored:' | |||||
83 | adding manifests |
|
89 | adding manifests | |
84 | adding file changes |
|
90 | adding file changes | |
85 | added 3 changesets with 3 changes to 3 files (+2 heads) |
|
91 | added 3 changesets with 3 changes to 3 files (+2 heads) | |
|
92 | new changesets 8c68ee086fd0:fcc393352796 | |||
86 | updating to branch default |
|
93 | updating to branch default | |
87 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 | $ rm -rf ../b |
|
95 | $ rm -rf ../b | |
@@ -92,6 +99,7 b' Test -r mine ... mine is ignored:' | |||||
92 | adding manifests |
|
99 | adding manifests | |
93 | adding file changes |
|
100 | adding file changes | |
94 | added 1 changesets with 1 changes to 1 files |
|
101 | added 1 changesets with 1 changes to 1 files | |
|
102 | new changesets fcc393352796 | |||
95 | updating to branch other |
|
103 | updating to branch other | |
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
104 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 | $ rm -rf ../b |
|
105 | $ rm -rf ../b |
@@ -148,6 +148,7 b' Use --pull:' | |||||
148 | adding manifests |
|
148 | adding manifests | |
149 | adding file changes |
|
149 | adding file changes | |
150 | added 11 changesets with 11 changes to 2 files |
|
150 | added 11 changesets with 11 changes to 2 files | |
|
151 | new changesets acb14030fe0a:a7949464abda | |||
151 | updating to branch default |
|
152 | updating to branch default | |
152 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
153 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
153 | $ hg -R g verify |
|
154 | $ hg -R g verify | |
@@ -269,6 +270,7 b' Testing clone --pull -u:' | |||||
269 | adding manifests |
|
270 | adding manifests | |
270 | adding file changes |
|
271 | adding file changes | |
271 | added 16 changesets with 16 changes to 3 files (+1 heads) |
|
272 | added 16 changesets with 16 changes to 3 files (+1 heads) | |
|
273 | new changesets acb14030fe0a:0aae7cf88f0d | |||
272 | updating to branch stable |
|
274 | updating to branch stable | |
273 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
274 |
|
276 | |||
@@ -409,6 +411,7 b' Testing #<branch>:' | |||||
409 | adding manifests |
|
411 | adding manifests | |
410 | adding file changes |
|
412 | adding file changes | |
411 | added 14 changesets with 14 changes to 3 files |
|
413 | added 14 changesets with 14 changes to 3 files | |
|
414 | new changesets acb14030fe0a:0aae7cf88f0d | |||
412 | updating to branch stable |
|
415 | updating to branch stable | |
413 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
416 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
414 |
|
417 | |||
@@ -445,6 +448,7 b' Testing -u -r <branch>:' | |||||
445 | adding manifests |
|
448 | adding manifests | |
446 | adding file changes |
|
449 | adding file changes | |
447 | added 14 changesets with 14 changes to 3 files |
|
450 | added 14 changesets with 14 changes to 3 files | |
|
451 | new changesets acb14030fe0a:0aae7cf88f0d | |||
448 | updating to branch stable |
|
452 | updating to branch stable | |
449 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
453 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
450 |
|
454 | |||
@@ -481,6 +485,7 b' Testing -r <branch>:' | |||||
481 | adding manifests |
|
485 | adding manifests | |
482 | adding file changes |
|
486 | adding file changes | |
483 | added 14 changesets with 14 changes to 3 files |
|
487 | added 14 changesets with 14 changes to 3 files | |
|
488 | new changesets acb14030fe0a:0aae7cf88f0d | |||
484 | updating to branch stable |
|
489 | updating to branch stable | |
485 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
490 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
486 |
|
491 | |||
@@ -543,6 +548,7 b' iterable in addbranchrevs()' | |||||
543 | adding manifests |
|
548 | adding manifests | |
544 | adding file changes |
|
549 | adding file changes | |
545 | added 14 changesets with 14 changes to 3 files |
|
550 | added 14 changesets with 14 changes to 3 files | |
|
551 | new changesets acb14030fe0a:0aae7cf88f0d | |||
546 | updating to branch stable |
|
552 | updating to branch stable | |
547 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
553 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
548 | $ rm -r ua |
|
554 | $ rm -r ua | |
@@ -774,6 +780,7 b' Clone with auto share from a repo with f' | |||||
774 | adding manifests |
|
780 | adding manifests | |
775 | adding file changes |
|
781 | adding file changes | |
776 | added 1 changesets with 1 changes to 1 files |
|
782 | added 1 changesets with 1 changes to 1 files | |
|
783 | new changesets e082c1832e09 | |||
777 | updating to branch default |
|
784 | updating to branch default | |
778 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
785 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
779 |
|
786 | |||
@@ -786,6 +793,7 b' Clone from repo with content should resu' | |||||
786 | adding manifests |
|
793 | adding manifests | |
787 | adding file changes |
|
794 | adding file changes | |
788 | added 3 changesets with 3 changes to 1 files |
|
795 | added 3 changesets with 3 changes to 1 files | |
|
796 | new changesets b5f04eac9d8f:e5bfe23c0b47 | |||
789 | searching for changes |
|
797 | searching for changes | |
790 | no changes found |
|
798 | no changes found | |
791 | adding remote bookmark bookA |
|
799 | adding remote bookmark bookA | |
@@ -823,6 +831,7 b' Clone with existing share dir should res' | |||||
823 | added 4 changesets with 4 changes to 1 files (+4 heads) |
|
831 | added 4 changesets with 4 changes to 1 files (+4 heads) | |
824 | adding remote bookmark head1 |
|
832 | adding remote bookmark head1 | |
825 | adding remote bookmark head2 |
|
833 | adding remote bookmark head2 | |
|
834 | new changesets 4a8dc1ab4c13:6bacf4683960 | |||
826 | updating working directory |
|
835 | updating working directory | |
827 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
836 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
828 |
|
837 | |||
@@ -863,6 +872,7 b' Clone from unrelated repo should result ' | |||||
863 | adding manifests |
|
872 | adding manifests | |
864 | adding file changes |
|
873 | adding file changes | |
865 | added 2 changesets with 2 changes to 1 files |
|
874 | added 2 changesets with 2 changes to 1 files | |
|
875 | new changesets 22aeff664783:63cf6c3dba4a | |||
866 | searching for changes |
|
876 | searching for changes | |
867 | no changes found |
|
877 | no changes found | |
868 | updating working directory |
|
878 | updating working directory | |
@@ -881,6 +891,7 b' remote naming mode works as advertised' | |||||
881 | adding manifests |
|
891 | adding manifests | |
882 | adding file changes |
|
892 | adding file changes | |
883 | added 3 changesets with 3 changes to 1 files |
|
893 | added 3 changesets with 3 changes to 1 files | |
|
894 | new changesets b5f04eac9d8f:e5bfe23c0b47 | |||
884 | searching for changes |
|
895 | searching for changes | |
885 | no changes found |
|
896 | no changes found | |
886 | adding remote bookmark bookA |
|
897 | adding remote bookmark bookA | |
@@ -897,6 +908,7 b' remote naming mode works as advertised' | |||||
897 | adding manifests |
|
908 | adding manifests | |
898 | adding file changes |
|
909 | adding file changes | |
899 | added 6 changesets with 6 changes to 1 files (+4 heads) |
|
910 | added 6 changesets with 6 changes to 1 files (+4 heads) | |
|
911 | new changesets b5f04eac9d8f:6bacf4683960 | |||
900 | searching for changes |
|
912 | searching for changes | |
901 | no changes found |
|
913 | no changes found | |
902 | adding remote bookmark head1 |
|
914 | adding remote bookmark head1 | |
@@ -916,6 +928,7 b' request to clone a single revision is re' | |||||
916 | adding manifests |
|
928 | adding manifests | |
917 | adding file changes |
|
929 | adding file changes | |
918 | added 2 changesets with 2 changes to 1 files |
|
930 | added 2 changesets with 2 changes to 1 files | |
|
931 | new changesets b5f04eac9d8f:4a8dc1ab4c13 | |||
919 | no changes found |
|
932 | no changes found | |
920 | adding remote bookmark head1 |
|
933 | adding remote bookmark head1 | |
921 | updating working directory |
|
934 | updating working directory | |
@@ -946,6 +959,7 b' making another clone should only pull do' | |||||
946 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
959 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
947 | adding remote bookmark head1 |
|
960 | adding remote bookmark head1 | |
948 | adding remote bookmark head2 |
|
961 | adding remote bookmark head2 | |
|
962 | new changesets 99f71071f117 | |||
949 | updating working directory |
|
963 | updating working directory | |
950 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
964 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
951 |
|
965 | |||
@@ -978,6 +992,7 b' Request to clone a single branch is resp' | |||||
978 | adding manifests |
|
992 | adding manifests | |
979 | adding file changes |
|
993 | adding file changes | |
980 | added 2 changesets with 2 changes to 1 files |
|
994 | added 2 changesets with 2 changes to 1 files | |
|
995 | new changesets b5f04eac9d8f:5f92a6c1a1b1 | |||
981 | no changes found |
|
996 | no changes found | |
982 | updating working directory |
|
997 | updating working directory | |
983 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
998 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -1003,6 +1018,7 b' Request to clone a single branch is resp' | |||||
1003 | adding manifests |
|
1018 | adding manifests | |
1004 | adding file changes |
|
1019 | adding file changes | |
1005 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1020 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
1021 | new changesets 6bacf4683960 | |||
1006 | updating working directory |
|
1022 | updating working directory | |
1007 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1023 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1008 |
|
1024 | |||
@@ -1084,6 +1100,7 b' pooled".' | |||||
1084 | adding manifests |
|
1100 | adding manifests | |
1085 | adding file changes |
|
1101 | adding file changes | |
1086 | added 3 changesets with 3 changes to 1 files |
|
1102 | added 3 changesets with 3 changes to 1 files | |
|
1103 | new changesets b5f04eac9d8f:e5bfe23c0b47 | |||
1087 | searching for changes |
|
1104 | searching for changes | |
1088 | no changes found |
|
1105 | no changes found | |
1089 | adding remote bookmark bookA |
|
1106 | adding remote bookmark bookA |
@@ -28,6 +28,7 b' Missing manifest should not result in se' | |||||
28 | adding manifests |
|
28 | adding manifests | |
29 | adding file changes |
|
29 | adding file changes | |
30 | added 2 changesets with 2 changes to 2 files |
|
30 | added 2 changesets with 2 changes to 2 files | |
|
31 | new changesets 53245c60e682:aaff8d2ffbbf | |||
31 |
|
32 | |||
32 | $ cat server/access.log |
|
33 | $ cat server/access.log | |
33 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
34 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) | |
@@ -45,6 +46,7 b' Empty manifest file results in retrieval' | |||||
45 | adding manifests |
|
46 | adding manifests | |
46 | adding file changes |
|
47 | adding file changes | |
47 | added 2 changesets with 2 changes to 2 files |
|
48 | added 2 changesets with 2 changes to 2 files | |
|
49 | new changesets 53245c60e682:aaff8d2ffbbf | |||
48 |
|
50 | |||
49 | Manifest file with invalid URL aborts |
|
51 | Manifest file with invalid URL aborts | |
50 |
|
52 | |||
@@ -89,6 +91,7 b' We can override failure to fall back to ' | |||||
89 | adding manifests |
|
91 | adding manifests | |
90 | adding file changes |
|
92 | adding file changes | |
91 | added 2 changesets with 2 changes to 2 files |
|
93 | added 2 changesets with 2 changes to 2 files | |
|
94 | new changesets 53245c60e682:aaff8d2ffbbf | |||
92 |
|
95 | |||
93 | Bundle with partial content works |
|
96 | Bundle with partial content works | |
94 |
|
97 | |||
@@ -127,6 +130,7 b' changes. If this output changes, we coul' | |||||
127 | adding manifests |
|
130 | adding manifests | |
128 | adding file changes |
|
131 | adding file changes | |
129 | added 1 changesets with 1 changes to 1 files |
|
132 | added 1 changesets with 1 changes to 1 files | |
|
133 | new changesets aaff8d2ffbbf | |||
130 |
|
134 | |||
131 | Incremental pull doesn't fetch bundle |
|
135 | Incremental pull doesn't fetch bundle | |
132 |
|
136 | |||
@@ -135,6 +139,7 b" Incremental pull doesn't fetch bundle" | |||||
135 | adding manifests |
|
139 | adding manifests | |
136 | adding file changes |
|
140 | adding file changes | |
137 | added 1 changesets with 1 changes to 1 files |
|
141 | added 1 changesets with 1 changes to 1 files | |
|
142 | new changesets 53245c60e682 | |||
138 |
|
143 | |||
139 | $ cd partial-clone |
|
144 | $ cd partial-clone | |
140 | $ hg pull |
|
145 | $ hg pull | |
@@ -144,6 +149,7 b" Incremental pull doesn't fetch bundle" | |||||
144 | adding manifests |
|
149 | adding manifests | |
145 | adding file changes |
|
150 | adding file changes | |
146 | added 1 changesets with 1 changes to 1 files |
|
151 | added 1 changesets with 1 changes to 1 files | |
|
152 | new changesets aaff8d2ffbbf | |||
147 | (run 'hg update' to get a working copy) |
|
153 | (run 'hg update' to get a working copy) | |
148 | $ cd .. |
|
154 | $ cd .. | |
149 |
|
155 | |||
@@ -240,6 +246,7 b' Automatic fallback when all entries are ' | |||||
240 | adding manifests |
|
246 | adding manifests | |
241 | adding file changes |
|
247 | adding file changes | |
242 | added 2 changesets with 2 changes to 2 files |
|
248 | added 2 changesets with 2 changes to 2 files | |
|
249 | new changesets 53245c60e682:aaff8d2ffbbf | |||
243 |
|
250 | |||
244 | URLs requiring SNI are filtered in Python <2.7.9 |
|
251 | URLs requiring SNI are filtered in Python <2.7.9 | |
245 |
|
252 | |||
@@ -337,6 +344,7 b' Stream bundle spec with unknown requirem' | |||||
337 | adding manifests |
|
344 | adding manifests | |
338 | adding file changes |
|
345 | adding file changes | |
339 | added 2 changesets with 2 changes to 2 files |
|
346 | added 2 changesets with 2 changes to 2 files | |
|
347 | new changesets 53245c60e682:aaff8d2ffbbf | |||
340 |
|
348 | |||
341 | Set up manifest for testing preferences |
|
349 | Set up manifest for testing preferences | |
342 | (Remember, the TYPE does not have to match reality - the URL is |
|
350 | (Remember, the TYPE does not have to match reality - the URL is |
@@ -79,6 +79,7 b' Rebuild fncache with clone --pull:' | |||||
79 | adding manifests |
|
79 | adding manifests | |
80 | adding file changes |
|
80 | adding file changes | |
81 | added 3 changesets with 3 changes to 1 files |
|
81 | added 3 changesets with 3 changes to 1 files | |
|
82 | new changesets de1da620e7d8:46946d278c50 | |||
82 |
|
83 | |||
83 | Verify: |
|
84 | Verify: | |
84 |
|
85 |
@@ -53,6 +53,7 b'' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 4 changesets with 3 changes to 3 files |
|
55 | added 4 changesets with 3 changes to 3 files | |
|
56 | new changesets 5fcb73622933:d15a0c284984 | |||
56 | updating to branch default |
|
57 | updating to branch default | |
57 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
58 |
|
59 | |||
@@ -61,6 +62,7 b'' | |||||
61 | adding manifests |
|
62 | adding manifests | |
62 | adding file changes |
|
63 | adding file changes | |
63 | added 4 changesets with 3 changes to 3 files |
|
64 | added 4 changesets with 3 changes to 3 files | |
|
65 | new changesets 5fcb73622933:1ec3c74fc0e0 | |||
64 | updating to branch default |
|
66 | updating to branch default | |
65 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 |
|
68 | |||
@@ -115,6 +117,7 b'' | |||||
115 | adding manifests |
|
117 | adding manifests | |
116 | adding file changes |
|
118 | adding file changes | |
117 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
119 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
120 | new changesets 1ec3c74fc0e0 | |||
118 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
121 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
119 |
|
122 | |||
120 | $ hg -R c pull a |
|
123 | $ hg -R c pull a | |
@@ -124,4 +127,5 b'' | |||||
124 | adding manifests |
|
127 | adding manifests | |
125 | adding file changes |
|
128 | adding file changes | |
126 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
129 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
130 | new changesets d15a0c284984 | |||
127 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
131 | (run 'hg heads' to see heads, 'hg merge' to merge) |
@@ -10,6 +10,7 b' we need a repo with some legacy latin-1 ' | |||||
10 | adding manifests |
|
10 | adding manifests | |
11 | adding file changes |
|
11 | adding file changes | |
12 | added 2 changesets with 2 changes to 1 files |
|
12 | added 2 changesets with 2 changes to 1 files | |
|
13 | new changesets 1e78a93102a3:0e5b7e3f9c4a | |||
13 | (run 'hg update' to get a working copy) |
|
14 | (run 'hg update' to get a working copy) | |
14 | $ hg co |
|
15 | $ hg co | |
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -61,6 +61,7 b' Test clone of revision with .hgeol' | |||||
61 | adding manifests |
|
61 | adding manifests | |
62 | adding file changes |
|
62 | adding file changes | |
63 | added 1 changesets with 2 changes to 2 files |
|
63 | added 1 changesets with 2 changes to 2 files | |
|
64 | new changesets 90f94e2cf4e2 | |||
64 | updating to branch default |
|
65 | updating to branch default | |
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
66 | $ cd repo-4 |
|
67 | $ cd repo-4 |
@@ -103,6 +103,7 b' Variant a: push -r A' | |||||
103 | adding file changes |
|
103 | adding file changes | |
104 | added 1 changesets with 1 changes to 1 files |
|
104 | added 1 changesets with 1 changes to 1 files | |
105 | 1 new obsolescence markers |
|
105 | 1 new obsolescence markers | |
|
106 | new changesets f5bc6836db60 | |||
106 | (run 'hg update' to get a working copy) |
|
107 | (run 'hg update' to get a working copy) | |
107 | ## post pull state |
|
108 | ## post pull state | |
108 | # obstore: main |
|
109 | # obstore: main | |
@@ -144,6 +145,7 b' Variant b: push' | |||||
144 | adding file changes |
|
145 | adding file changes | |
145 | added 1 changesets with 1 changes to 1 files |
|
146 | added 1 changesets with 1 changes to 1 files | |
146 | 1 new obsolescence markers |
|
147 | 1 new obsolescence markers | |
|
148 | new changesets f5bc6836db60 | |||
147 | (run 'hg update' to get a working copy) |
|
149 | (run 'hg update' to get a working copy) | |
148 | ## post pull state |
|
150 | ## post pull state | |
149 | # obstore: main |
|
151 | # obstore: main | |
@@ -244,6 +246,7 b' Variant a: push -r A' | |||||
244 | adding file changes |
|
246 | adding file changes | |
245 | added 2 changesets with 2 changes to 2 files |
|
247 | added 2 changesets with 2 changes to 2 files | |
246 | 1 new obsolescence markers |
|
248 | 1 new obsolescence markers | |
|
249 | new changesets f5bc6836db60:f6fbb35d8ac9 | |||
247 | (run 'hg update' to get a working copy) |
|
250 | (run 'hg update' to get a working copy) | |
248 | ## post pull state |
|
251 | ## post pull state | |
249 | # obstore: main |
|
252 | # obstore: main | |
@@ -285,6 +288,7 b' Variant b: push' | |||||
285 | adding file changes |
|
288 | adding file changes | |
286 | added 2 changesets with 2 changes to 2 files |
|
289 | added 2 changesets with 2 changes to 2 files | |
287 | 1 new obsolescence markers |
|
290 | 1 new obsolescence markers | |
|
291 | new changesets f5bc6836db60:f6fbb35d8ac9 | |||
288 | (run 'hg update' to get a working copy) |
|
292 | (run 'hg update' to get a working copy) | |
289 | ## post pull state |
|
293 | ## post pull state | |
290 | # obstore: main |
|
294 | # obstore: main |
@@ -111,6 +111,7 b' Actual Test' | |||||
111 | adding file changes |
|
111 | adding file changes | |
112 | added 1 changesets with 1 changes to 1 files |
|
112 | added 1 changesets with 1 changes to 1 files | |
113 | 1 new obsolescence markers |
|
113 | 1 new obsolescence markers | |
|
114 | new changesets f5bc6836db60 | |||
114 | (run 'hg update' to get a working copy) |
|
115 | (run 'hg update' to get a working copy) | |
115 | ## post pull state |
|
116 | ## post pull state | |
116 | # obstore: main |
|
117 | # obstore: main |
@@ -130,6 +130,7 b' Actual Test for first version (changeset' | |||||
130 | adding file changes |
|
130 | adding file changes | |
131 | added 1 changesets with 1 changes to 1 files |
|
131 | added 1 changesets with 1 changes to 1 files | |
132 | 1 new obsolescence markers |
|
132 | 1 new obsolescence markers | |
|
133 | new changesets e5ea8f9c7314 | |||
133 | (run 'hg update' to get a working copy) |
|
134 | (run 'hg update' to get a working copy) | |
134 | ## post pull state |
|
135 | ## post pull state | |
135 | # obstore: main |
|
136 | # obstore: main | |
@@ -233,6 +234,7 b' test obsmarkers exchange.' | |||||
233 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
234 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
234 | 1 new obsolescence markers |
|
235 | 1 new obsolescence markers | |
235 | obsoleted 1 changesets |
|
236 | obsoleted 1 changesets | |
|
237 | new changesets e5ea8f9c7314 | |||
236 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
238 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
237 | ## post pull state |
|
239 | ## post pull state | |
238 | # obstore: main |
|
240 | # obstore: main |
@@ -117,6 +117,7 b' Actual Test for first version' | |||||
117 | adding file changes |
|
117 | adding file changes | |
118 | added 2 changesets with 2 changes to 2 files |
|
118 | added 2 changesets with 2 changes to 2 files | |
119 | 1 new obsolescence markers |
|
119 | 1 new obsolescence markers | |
|
120 | new changesets 28b51eb45704:06055a7959d4 | |||
120 | (run 'hg update' to get a working copy) |
|
121 | (run 'hg update' to get a working copy) | |
121 | ## post pull state |
|
122 | ## post pull state | |
122 | # obstore: main |
|
123 | # obstore: main |
@@ -126,6 +126,7 b' Actual Test' | |||||
126 | adding file changes |
|
126 | adding file changes | |
127 | added 1 changesets with 1 changes to 1 files |
|
127 | added 1 changesets with 1 changes to 1 files | |
128 | 1 new obsolescence markers |
|
128 | 1 new obsolescence markers | |
|
129 | new changesets f6298a8ac3a4 | |||
129 | (run 'hg update' to get a working copy) |
|
130 | (run 'hg update' to get a working copy) | |
130 | ## post pull state |
|
131 | ## post pull state | |
131 | # obstore: main |
|
132 | # obstore: main |
@@ -106,6 +106,7 b' Actual Test' | |||||
106 | adding manifests |
|
106 | adding manifests | |
107 | adding file changes |
|
107 | adding file changes | |
108 | added 1 changesets with 1 changes to 1 files |
|
108 | added 1 changesets with 1 changes to 1 files | |
|
109 | new changesets f5bc6836db60 | |||
109 | (run 'hg update' to get a working copy) |
|
110 | (run 'hg update' to get a working copy) | |
110 | ## post pull state |
|
111 | ## post pull state | |
111 | # obstore: main |
|
112 | # obstore: main |
@@ -137,6 +137,7 b' Actual Test (explicit push version)' | |||||
137 | adding file changes |
|
137 | adding file changes | |
138 | added 3 changesets with 3 changes to 3 files |
|
138 | added 3 changesets with 3 changes to 3 files | |
139 | 1 new obsolescence markers |
|
139 | 1 new obsolescence markers | |
|
140 | new changesets 28b51eb45704:1d0f3cd25300 | |||
140 | (run 'hg update' to get a working copy) |
|
141 | (run 'hg update' to get a working copy) | |
141 | ## post pull state |
|
142 | ## post pull state | |
142 | # obstore: main |
|
143 | # obstore: main |
@@ -119,6 +119,7 b' Actual Test (explicit push)' | |||||
119 | adding file changes |
|
119 | adding file changes | |
120 | added 1 changesets with 1 changes to 1 files |
|
120 | added 1 changesets with 1 changes to 1 files | |
121 | 2 new obsolescence markers |
|
121 | 2 new obsolescence markers | |
|
122 | new changesets e5ea8f9c7314 | |||
122 | (run 'hg update' to get a working copy) |
|
123 | (run 'hg update' to get a working copy) | |
123 | ## post pull state |
|
124 | ## post pull state | |
124 | # obstore: main |
|
125 | # obstore: main | |
@@ -166,6 +167,7 b' Actual Test (bare push)' | |||||
166 | adding file changes |
|
167 | adding file changes | |
167 | added 1 changesets with 1 changes to 1 files |
|
168 | added 1 changesets with 1 changes to 1 files | |
168 | 2 new obsolescence markers |
|
169 | 2 new obsolescence markers | |
|
170 | new changesets e5ea8f9c7314 | |||
169 | (run 'hg update' to get a working copy) |
|
171 | (run 'hg update' to get a working copy) | |
170 | ## post pull state |
|
172 | ## post pull state | |
171 | # obstore: main |
|
173 | # obstore: main |
@@ -117,6 +117,7 b' Actual Test (explicit push)' | |||||
117 | adding file changes |
|
117 | adding file changes | |
118 | added 1 changesets with 1 changes to 1 files |
|
118 | added 1 changesets with 1 changes to 1 files | |
119 | 2 new obsolescence markers |
|
119 | 2 new obsolescence markers | |
|
120 | new changesets e5ea8f9c7314 | |||
120 | (run 'hg update' to get a working copy) |
|
121 | (run 'hg update' to get a working copy) | |
121 | ## post pull state |
|
122 | ## post pull state | |
122 | # obstore: main |
|
123 | # obstore: main | |
@@ -164,6 +165,7 b' Actual Test (base push)' | |||||
164 | adding file changes |
|
165 | adding file changes | |
165 | added 1 changesets with 1 changes to 1 files |
|
166 | added 1 changesets with 1 changes to 1 files | |
166 | 2 new obsolescence markers |
|
167 | 2 new obsolescence markers | |
|
168 | new changesets e5ea8f9c7314 | |||
167 | (run 'hg update' to get a working copy) |
|
169 | (run 'hg update' to get a working copy) | |
168 | ## post pull state |
|
170 | ## post pull state | |
169 | # obstore: main |
|
171 | # obstore: main |
@@ -125,6 +125,7 b' Actual Test' | |||||
125 | adding file changes |
|
125 | adding file changes | |
126 | added 1 changesets with 1 changes to 1 files |
|
126 | added 1 changesets with 1 changes to 1 files | |
127 | 2 new obsolescence markers |
|
127 | 2 new obsolescence markers | |
|
128 | new changesets e5ea8f9c7314 | |||
128 | (run 'hg update' to get a working copy) |
|
129 | (run 'hg update' to get a working copy) | |
129 | ## post pull state |
|
130 | ## post pull state | |
130 | # obstore: main |
|
131 | # obstore: main |
@@ -30,6 +30,7 b' should pull one change' | |||||
30 | adding manifests |
|
30 | adding manifests | |
31 | adding file changes |
|
31 | adding file changes | |
32 | added 1 changesets with 1 changes to 1 files |
|
32 | added 1 changesets with 1 changes to 1 files | |
|
33 | new changesets d2ae7f538514 | |||
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
34 | $ hg --cwd b parents -q |
|
35 | $ hg --cwd b parents -q | |
35 | 1:d2ae7f538514 |
|
36 | 1:d2ae7f538514 | |
@@ -55,6 +56,7 b' should merge c into a' | |||||
55 | adding manifests |
|
56 | adding manifests | |
56 | adding file changes |
|
57 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
58 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
59 | new changesets d2ae7f538514 | |||
58 | updating to 2:d2ae7f538514 |
|
60 | updating to 2:d2ae7f538514 | |
59 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
60 | merging with 1:d36c0562f908 |
|
62 | merging with 1:d36c0562f908 | |
@@ -77,6 +79,7 b' fetch over http, no auth' | |||||
77 | adding manifests |
|
79 | adding manifests | |
78 | adding file changes |
|
80 | adding file changes | |
79 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
81 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
82 | new changesets d2ae7f538514 | |||
80 | updating to 2:d2ae7f538514 |
|
83 | updating to 2:d2ae7f538514 | |
81 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
82 | merging with 1:d36c0562f908 |
|
85 | merging with 1:d36c0562f908 | |
@@ -110,6 +113,7 b' specified, even though commit message is' | |||||
110 | adding manifests |
|
113 | adding manifests | |
111 | adding file changes |
|
114 | adding file changes | |
112 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
115 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
116 | new changesets d2ae7f538514 | |||
113 | updating to 2:d2ae7f538514 |
|
117 | updating to 2:d2ae7f538514 | |
114 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
118 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
115 | merging with 1:d36c0562f908 |
|
119 | merging with 1:d36c0562f908 | |
@@ -141,6 +145,7 b' should merge f into g' | |||||
141 | adding manifests |
|
145 | adding manifests | |
142 | adding file changes |
|
146 | adding file changes | |
143 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
147 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
148 | new changesets 6343ca3eff20 | |||
144 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
145 | merging with 3:6343ca3eff20 |
|
150 | merging with 3:6343ca3eff20 | |
146 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -193,6 +198,7 b' pull in change on foreign branch' | |||||
193 | adding manifests |
|
198 | adding manifests | |
194 | adding file changes |
|
199 | adding file changes | |
195 | added 1 changesets with 1 changes to 1 files |
|
200 | added 1 changesets with 1 changes to 1 files | |
|
201 | new changesets 8fdc9284bbc5 | |||
196 |
|
202 | |||
197 | parent should be 2 (no automatic update) |
|
203 | parent should be 2 (no automatic update) | |
198 |
|
204 | |||
@@ -225,6 +231,7 b' pull in changes on both foreign and loca' | |||||
225 | adding manifests |
|
231 | adding manifests | |
226 | adding file changes |
|
232 | adding file changes | |
227 | added 2 changesets with 2 changes to 2 files |
|
233 | added 2 changesets with 2 changes to 2 files | |
|
234 | new changesets 8fdc9284bbc5:3c4a837a864f | |||
228 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
235 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
229 |
|
236 | |||
230 | parent should be 4 (fast forward) |
|
237 | parent should be 4 (fast forward) | |
@@ -267,6 +274,7 b' with a local change' | |||||
267 | adding manifests |
|
274 | adding manifests | |
268 | adding file changes |
|
275 | adding file changes | |
269 | added 3 changesets with 3 changes to 2 files (+2 heads) |
|
276 | added 3 changesets with 3 changes to 2 files (+2 heads) | |
|
277 | new changesets d05ce59ff88d:a7954de24e4c | |||
270 | updating to 5:3c4a837a864f |
|
278 | updating to 5:3c4a837a864f | |
271 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
279 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
272 | merging with 3:1267f84a9ea5 |
|
280 | merging with 3:1267f84a9ea5 | |
@@ -314,6 +322,7 b' heads) with a local change' | |||||
314 | adding manifests |
|
322 | adding manifests | |
315 | adding file changes |
|
323 | adding file changes | |
316 | added 3 changesets with 2 changes to 1 files (+2 heads) |
|
324 | added 3 changesets with 2 changes to 1 files (+2 heads) | |
|
325 | new changesets b84e8d0f020f:3d3bf54f99c0 | |||
317 | not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) |
|
326 | not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) | |
318 | [1] |
|
327 | [1] | |
319 |
|
328 | |||
@@ -398,6 +407,7 b' test issue1726' | |||||
398 | adding manifests |
|
407 | adding manifests | |
399 | adding file changes |
|
408 | adding file changes | |
400 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
409 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
410 | new changesets 7837755a2789 | |||
401 | updating to 2:7837755a2789 |
|
411 | updating to 2:7837755a2789 | |
402 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
412 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
403 | merging with 1:d1f0c6c48ebd |
|
413 | merging with 1:d1f0c6c48ebd | |
@@ -426,5 +436,6 b' test issue2047' | |||||
426 | adding manifests |
|
436 | adding manifests | |
427 | adding file changes |
|
437 | adding file changes | |
428 | added 1 changesets with 1 changes to 1 files |
|
438 | added 1 changesets with 1 changes to 1 files | |
|
439 | new changesets c8735224de5c | |||
429 |
|
440 | |||
430 | $ cd .. |
|
441 | $ cd .. |
@@ -53,6 +53,7 b' Merging:' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
55 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
|
56 | new changesets bdd988058d16 | |||
56 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
57 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
57 |
|
58 | |||
58 | $ hg merge -v |
|
59 | $ hg merge -v |
@@ -107,6 +107,7 b'' | |||||
107 | adding manifests |
|
107 | adding manifests | |
108 | adding file changes |
|
108 | adding file changes | |
109 | added 7 changesets with 7 changes to 7 files |
|
109 | added 7 changesets with 7 changes to 7 files | |
|
110 | new changesets 07b1b9442c5b:6e48f4215d24 | |||
110 | (run 'hg update' to get a working copy) |
|
111 | (run 'hg update' to get a working copy) | |
111 | $ hg update |
|
112 | $ hg update | |
112 | 7 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 7 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -22,6 +22,7 b'' | |||||
22 | adding manifests |
|
22 | adding manifests | |
23 | adding file changes |
|
23 | adding file changes | |
24 | added 1 changesets with 2 changes to 2 files |
|
24 | added 1 changesets with 2 changes to 2 files | |
|
25 | new changesets 22a449e20da5 | |||
25 | (run 'hg update' to get a working copy) |
|
26 | (run 'hg update' to get a working copy) | |
26 | $ hg co |
|
27 | $ hg co | |
27 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -44,6 +45,7 b' the changelog should mention file a:' | |||||
44 | adding manifests |
|
45 | adding manifests | |
45 | adding file changes |
|
46 | adding file changes | |
46 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
47 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
48 | new changesets 7f4313b42a34 | |||
47 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
49 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
48 | $ hg heads |
|
50 | $ hg heads | |
49 | changeset: 2:7f4313b42a34 |
|
51 | changeset: 2:7f4313b42a34 | |
@@ -96,6 +98,7 b' the changelog should mention file a:' | |||||
96 | adding manifests |
|
98 | adding manifests | |
97 | adding file changes |
|
99 | adding file changes | |
98 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
100 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
101 | new changesets 7f4313b42a34 | |||
99 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
102 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
100 | $ hg heads |
|
103 | $ hg heads | |
101 | changeset: 2:7f4313b42a34 |
|
104 | changeset: 2:7f4313b42a34 |
@@ -85,6 +85,7 b' delta coming from the server base delta ' | |||||
85 | adding manifests |
|
85 | adding manifests | |
86 | adding file changes |
|
86 | adding file changes | |
87 | added 4 changesets with 6 changes to 3 files (+2 heads) |
|
87 | added 4 changesets with 6 changes to 3 files (+2 heads) | |
|
88 | new changesets 0ea3fcf9d01d:bba78d330d9c | |||
88 | updating to branch default |
|
89 | updating to branch default | |
89 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
90 | $ hg clone repo --pull --config format.generaldelta=1 full |
|
91 | $ hg clone repo --pull --config format.generaldelta=1 full | |
@@ -93,6 +94,7 b' delta coming from the server base delta ' | |||||
93 | adding manifests |
|
94 | adding manifests | |
94 | adding file changes |
|
95 | adding file changes | |
95 | added 4 changesets with 6 changes to 3 files (+2 heads) |
|
96 | added 4 changesets with 6 changes to 3 files (+2 heads) | |
|
97 | new changesets 0ea3fcf9d01d:bba78d330d9c | |||
96 | updating to branch default |
|
98 | updating to branch default | |
97 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
99 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 | $ hg -R repo debugindex -m |
|
100 | $ hg -R repo debugindex -m | |
@@ -229,6 +231,7 b' test maxdeltachainspan' | |||||
229 | adding manifests |
|
231 | adding manifests | |
230 | adding file changes |
|
232 | adding file changes | |
231 | added 53 changesets with 53 changes to 53 files (+2 heads) |
|
233 | added 53 changesets with 53 changes to 53 files (+2 heads) | |
|
234 | new changesets 61246295ee1e:99cae3713489 | |||
232 | updating to branch default |
|
235 | updating to branch default | |
233 | 14 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
236 | 14 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
234 | $ hg -R relax-chain debugindex -m |
|
237 | $ hg -R relax-chain debugindex -m | |
@@ -292,6 +295,7 b' test maxdeltachainspan' | |||||
292 | adding manifests |
|
295 | adding manifests | |
293 | adding file changes |
|
296 | adding file changes | |
294 | added 53 changesets with 53 changes to 53 files (+2 heads) |
|
297 | added 53 changesets with 53 changes to 53 files (+2 heads) | |
|
298 | new changesets 61246295ee1e:99cae3713489 | |||
295 | updating to branch default |
|
299 | updating to branch default | |
296 | 14 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
300 | 14 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
297 | $ hg -R noconst-chain debugindex -m |
|
301 | $ hg -R noconst-chain debugindex -m |
@@ -31,6 +31,7 b'' | |||||
31 | adding manifests |
|
31 | adding manifests | |
32 | adding file changes |
|
32 | adding file changes | |
33 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
33 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
34 | new changesets b6c483daf290 | |||
34 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
35 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
35 | $ hg merge |
|
36 | $ hg merge | |
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -16,6 +16,7 b' later.' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
18 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
19 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
19 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
20 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
20 |
|
21 | |||
21 | $ hg log -G |
|
22 | $ hg log -G |
@@ -1214,6 +1214,7 b' Incoming and outgoing:' | |||||
1214 | adding manifests |
|
1214 | adding manifests | |
1215 | adding file changes |
|
1215 | adding file changes | |
1216 | added 31 changesets with 31 changes to 1 files |
|
1216 | added 31 changesets with 31 changes to 1 files | |
|
1217 | new changesets e6eb3150255d:621d83e11f67 | |||
1217 | $ cd repo2 |
|
1218 | $ cd repo2 | |
1218 |
|
1219 | |||
1219 | $ hg incoming --graph ../repo |
|
1220 | $ hg incoming --graph ../repo |
@@ -77,6 +77,7 b' Create non-hardlinked clone r3:' | |||||
77 | adding manifests |
|
77 | adding manifests | |
78 | adding file changes |
|
78 | adding file changes | |
79 | added 2 changesets with 2 changes to 2 files |
|
79 | added 2 changesets with 2 changes to 2 files | |
|
80 | new changesets 40d85e9847f2:7069c422939c | |||
80 | updating to branch default |
|
81 | updating to branch default | |
81 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
82 |
|
83 |
@@ -1111,6 +1111,7 b' test import rev as raw-rev' | |||||
1111 | adding manifests |
|
1111 | adding manifests | |
1112 | adding file changes |
|
1112 | adding file changes | |
1113 | added 1 changesets with 2 changes to 2 files |
|
1113 | added 1 changesets with 2 changes to 2 files | |
|
1114 | new changesets 0cd96de13884 | |||
1114 | updating to branch default |
|
1115 | updating to branch default | |
1115 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1116 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1116 | $ cd test1 |
|
1117 | $ cd test1 |
@@ -16,6 +16,7 b' Create repo a:' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
18 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
19 | new changesets cd010b8cd998:02de42196ebe | |||
19 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
20 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
20 | $ hg up tip |
|
21 | $ hg up tip | |
21 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -364,6 +364,7 b' should also work if a commit message is ' | |||||
364 | adding manifests |
|
364 | adding manifests | |
365 | adding file changes |
|
365 | adding file changes | |
366 | added 3 changesets with 3 changes to 1 files |
|
366 | added 3 changesets with 3 changes to 1 files | |
|
367 | new changesets 141947992243:bd22688093b3 | |||
367 | (run 'hg update' to get a working copy) |
|
368 | (run 'hg update' to get a working copy) | |
368 | $ hg co tip |
|
369 | $ hg co tip | |
369 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
370 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -112,6 +112,7 b' test generic hooks' | |||||
112 | adding manifests |
|
112 | adding manifests | |
113 | adding file changes |
|
113 | adding file changes | |
114 | added 3 changesets with 2 changes to 2 files |
|
114 | added 3 changesets with 2 changes to 2 files | |
|
115 | new changesets ab228980c14d:07f3376c1e65 | |||
115 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a |
|
116 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_NODE_LAST=07f3376c1e655977439df2a814e3cc14b27abac2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a | |
116 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a |
|
117 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ab228980c14deea8b9555d91c9581127383e40fd HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a | |
117 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a |
|
118 | incoming hook: HG_HOOKNAME=incoming HG_HOOKTYPE=incoming HG_NODE=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=file:$TESTTMP/a | |
@@ -362,6 +363,7 b' outgoing hooks can see env vars' | |||||
362 | adding file changes |
|
363 | adding file changes | |
363 | added 1 changesets with 1 changes to 1 files |
|
364 | added 1 changesets with 1 changes to 1 files | |
364 | adding remote bookmark quux |
|
365 | adding remote bookmark quux | |
|
366 | new changesets 539e4b31b6dc | |||
365 | (run 'hg update' to get a working copy) |
|
367 | (run 'hg update' to get a working copy) | |
366 | $ hg rollback |
|
368 | $ hg rollback | |
367 | repository tip rolled back to revision 3 (undo pull) |
|
369 | repository tip rolled back to revision 3 (undo pull) | |
@@ -571,6 +573,7 b' different between Python 2.6 and Python ' | |||||
571 | adding file changes |
|
573 | adding file changes | |
572 | added 1 changesets with 1 changes to 1 files |
|
574 | added 1 changesets with 1 changes to 1 files | |
573 | adding remote bookmark quux |
|
575 | adding remote bookmark quux | |
|
576 | new changesets 539e4b31b6dc | |||
574 | (run 'hg update' to get a working copy) |
|
577 | (run 'hg update' to get a working copy) | |
575 |
|
578 | |||
576 | post- python hooks that fail to *run* don't cause an abort |
|
579 | post- python hooks that fail to *run* don't cause an abort |
@@ -833,6 +833,7 b' This is before the 0 size chunked transf' | |||||
833 | adding manifests |
|
833 | adding manifests | |
834 | adding file changes |
|
834 | adding file changes | |
835 | added 1 changesets with 1 changes to 1 files |
|
835 | added 1 changesets with 1 changes to 1 files | |
|
836 | new changesets 96ee1d7354c4 | |||
836 | updating to branch default |
|
837 | updating to branch default | |
837 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
838 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
838 |
|
839 | |||
@@ -876,6 +877,7 b' Server sends a size 0 chunked-transfer s' | |||||
876 | adding manifests |
|
877 | adding manifests | |
877 | adding file changes |
|
878 | adding file changes | |
878 | added 1 changesets with 1 changes to 1 files |
|
879 | added 1 changesets with 1 changes to 1 files | |
|
880 | new changesets 96ee1d7354c4 | |||
879 | updating to branch default |
|
881 | updating to branch default | |
880 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
882 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
881 |
|
883 |
@@ -21,6 +21,7 b'' | |||||
21 | adding manifests |
|
21 | adding manifests | |
22 | adding file changes |
|
22 | adding file changes | |
23 | added 1 changesets with 1 changes to 1 files |
|
23 | added 1 changesets with 1 changes to 1 files | |
|
24 | new changesets 867c11ce77b8 | |||
24 | updating to branch \xc3\xa6 (esc) |
|
25 | updating to branch \xc3\xa6 (esc) | |
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 | $ hg --encoding utf-8 -R b log |
|
27 | $ hg --encoding utf-8 -R b log |
@@ -64,6 +64,7 b' try to clone via stream, should use pull' | |||||
64 | adding manifests |
|
64 | adding manifests | |
65 | adding file changes |
|
65 | adding file changes | |
66 | added 1 changesets with 4 changes to 4 files |
|
66 | added 1 changesets with 4 changes to 4 files | |
|
67 | new changesets 8b6053c928fe | |||
67 | updating to branch default |
|
68 | updating to branch default | |
68 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
69 |
|
70 | |||
@@ -83,6 +84,7 b' try to clone via stream but missing requ' | |||||
83 | adding manifests |
|
84 | adding manifests | |
84 | adding file changes |
|
85 | adding file changes | |
85 | added 1 changesets with 4 changes to 4 files |
|
86 | added 1 changesets with 4 changes to 4 files | |
|
87 | new changesets 8b6053c928fe | |||
86 | updating to branch default |
|
88 | updating to branch default | |
87 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 |
|
90 | |||
@@ -94,6 +96,7 b' clone via pull' | |||||
94 | adding manifests |
|
96 | adding manifests | |
95 | adding file changes |
|
97 | adding file changes | |
96 | added 1 changesets with 4 changes to 4 files |
|
98 | added 1 changesets with 4 changes to 4 files | |
|
99 | new changesets 8b6053c928fe | |||
97 | updating to branch default |
|
100 | updating to branch default | |
98 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
99 | $ hg verify -R copy-pull |
|
102 | $ hg verify -R copy-pull | |
@@ -116,6 +119,7 b' clone over http with --update' | |||||
116 | adding manifests |
|
119 | adding manifests | |
117 | adding file changes |
|
120 | adding file changes | |
118 | added 2 changesets with 5 changes to 5 files |
|
121 | added 2 changesets with 5 changes to 5 files | |
|
122 | new changesets 8b6053c928fe:5fed3813f7f5 | |||
119 | updating to branch default |
|
123 | updating to branch default | |
120 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
124 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
121 | $ hg log -r . -R updated |
|
125 | $ hg log -r . -R updated | |
@@ -133,6 +137,7 b' incoming via HTTP' | |||||
133 | adding manifests |
|
137 | adding manifests | |
134 | adding file changes |
|
138 | adding file changes | |
135 | added 1 changesets with 4 changes to 4 files |
|
139 | added 1 changesets with 4 changes to 4 files | |
|
140 | new changesets 8b6053c928fe | |||
136 | updating to branch default |
|
141 | updating to branch default | |
137 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
142 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
138 | $ cd partial |
|
143 | $ cd partial | |
@@ -158,6 +163,7 b' pull' | |||||
158 | adding manifests |
|
163 | adding manifests | |
159 | adding file changes |
|
164 | adding file changes | |
160 | added 1 changesets with 1 changes to 1 files |
|
165 | added 1 changesets with 1 changes to 1 files | |
|
166 | new changesets 5fed3813f7f5 | |||
161 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/ |
|
167 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/ | |
162 | (run 'hg update' to get a working copy) |
|
168 | (run 'hg update' to get a working copy) | |
163 | $ cd .. |
|
169 | $ cd .. | |
@@ -236,6 +242,7 b' test http authentication' | |||||
236 | adding manifests |
|
242 | adding manifests | |
237 | adding file changes |
|
243 | adding file changes | |
238 | added 2 changesets with 5 changes to 5 files |
|
244 | added 2 changesets with 5 changes to 5 files | |
|
245 | new changesets 8b6053c928fe:5fed3813f7f5 | |||
239 | updating to branch default |
|
246 | updating to branch default | |
240 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
247 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 |
|
248 | |||
@@ -337,6 +344,7 b' clone of serve with repo in root and uns' | |||||
337 | adding manifests |
|
344 | adding manifests | |
338 | adding file changes |
|
345 | adding file changes | |
339 | added 3 changesets with 7 changes to 7 files |
|
346 | added 3 changesets with 7 changes to 7 files | |
|
347 | new changesets 8b6053c928fe:56f9bc90cce6 | |||
340 | updating to branch default |
|
348 | updating to branch default | |
341 | abort: HTTP Error 404: Not Found |
|
349 | abort: HTTP Error 404: Not Found | |
342 | [255] |
|
350 | [255] | |
@@ -346,6 +354,7 b' clone of serve with repo in root and uns' | |||||
346 | adding manifests |
|
354 | adding manifests | |
347 | adding file changes |
|
355 | adding file changes | |
348 | added 3 changesets with 7 changes to 7 files |
|
356 | added 3 changesets with 7 changes to 7 files | |
|
357 | new changesets 8b6053c928fe:56f9bc90cce6 | |||
349 | updating to branch default |
|
358 | updating to branch default | |
350 | abort: HTTP Error 404: Not Found |
|
359 | abort: HTTP Error 404: Not Found | |
351 | [255] |
|
360 | [255] | |
@@ -391,6 +400,7 b' disable pull-based clones' | |||||
391 | adding manifests |
|
400 | adding manifests | |
392 | adding file changes |
|
401 | adding file changes | |
393 | added 1 changesets with 4 changes to 4 files |
|
402 | added 1 changesets with 4 changes to 4 files | |
|
403 | new changesets 8b6053c928fe | |||
394 | updating to branch default |
|
404 | updating to branch default | |
395 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
405 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
396 | $ hg pull -R test-partial-clone |
|
406 | $ hg pull -R test-partial-clone | |
@@ -400,6 +410,7 b' disable pull-based clones' | |||||
400 | adding manifests |
|
410 | adding manifests | |
401 | adding file changes |
|
411 | adding file changes | |
402 | added 2 changesets with 3 changes to 3 files |
|
412 | added 2 changesets with 3 changes to 3 files | |
|
413 | new changesets 5fed3813f7f5:56f9bc90cce6 | |||
403 | (run 'hg update' to get a working copy) |
|
414 | (run 'hg update' to get a working copy) | |
404 |
|
415 | |||
405 | $ cat error.log |
|
416 | $ cat error.log |
@@ -9,6 +9,7 b" creating 'remote" | |||||
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
11 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
12 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
13 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 | $ hg up tip |
|
14 | $ hg up tip | |
14 | 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 | |
@@ -32,6 +33,7 b' clone remote via stream' | |||||
32 | adding manifests |
|
33 | adding manifests | |
33 | adding file changes |
|
34 | adding file changes | |
34 | added 1 changesets with 1 changes to 1 files |
|
35 | added 1 changesets with 1 changes to 1 files | |
|
36 | new changesets bfaf4b5cbf01 | |||
35 | updating to branch default |
|
37 | updating to branch default | |
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
38 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 | checking changesets |
|
39 | checking changesets | |
@@ -43,6 +45,7 b' clone remote via stream' | |||||
43 | adding manifests |
|
45 | adding manifests | |
44 | adding file changes |
|
46 | adding file changes | |
45 | added 2 changesets with 2 changes to 1 files |
|
47 | added 2 changesets with 2 changes to 1 files | |
|
48 | new changesets bfaf4b5cbf01:21f32785131f | |||
46 | updating to branch default |
|
49 | updating to branch default | |
47 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 | checking changesets |
|
51 | checking changesets | |
@@ -54,6 +57,7 b' clone remote via stream' | |||||
54 | adding manifests |
|
57 | adding manifests | |
55 | adding file changes |
|
58 | adding file changes | |
56 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
|
60 | new changesets bfaf4b5cbf01:4ce51a113780 | |||
57 | updating to branch default |
|
61 | updating to branch default | |
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
62 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | checking changesets |
|
63 | checking changesets | |
@@ -65,6 +69,7 b' clone remote via stream' | |||||
65 | adding manifests |
|
69 | adding manifests | |
66 | adding file changes |
|
70 | adding file changes | |
67 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
|
72 | new changesets bfaf4b5cbf01:93ee6ab32777 | |||
68 | updating to branch default |
|
73 | updating to branch default | |
69 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
70 | checking changesets |
|
75 | checking changesets | |
@@ -76,6 +81,7 b' clone remote via stream' | |||||
76 | adding manifests |
|
81 | adding manifests | |
77 | adding file changes |
|
82 | adding file changes | |
78 | added 2 changesets with 2 changes to 1 files |
|
83 | added 2 changesets with 2 changes to 1 files | |
|
84 | new changesets bfaf4b5cbf01:c70afb1ee985 | |||
79 | updating to branch default |
|
85 | updating to branch default | |
80 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
86 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
81 | checking changesets |
|
87 | checking changesets | |
@@ -87,6 +93,7 b' clone remote via stream' | |||||
87 | adding manifests |
|
93 | adding manifests | |
88 | adding file changes |
|
94 | adding file changes | |
89 | added 3 changesets with 3 changes to 1 files |
|
95 | added 3 changesets with 3 changes to 1 files | |
|
96 | new changesets bfaf4b5cbf01:f03ae5a9b979 | |||
90 | updating to branch default |
|
97 | updating to branch default | |
91 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
98 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
92 | checking changesets |
|
99 | checking changesets | |
@@ -98,6 +105,7 b' clone remote via stream' | |||||
98 | adding manifests |
|
105 | adding manifests | |
99 | adding file changes |
|
106 | adding file changes | |
100 | added 4 changesets with 5 changes to 2 files |
|
107 | added 4 changesets with 5 changes to 2 files | |
|
108 | new changesets bfaf4b5cbf01:095cb14b1b4d | |||
101 | updating to branch default |
|
109 | updating to branch default | |
102 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
110 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
103 | checking changesets |
|
111 | checking changesets | |
@@ -109,6 +117,7 b' clone remote via stream' | |||||
109 | adding manifests |
|
117 | adding manifests | |
110 | adding file changes |
|
118 | adding file changes | |
111 | added 5 changesets with 6 changes to 3 files |
|
119 | added 5 changesets with 6 changes to 3 files | |
|
120 | new changesets bfaf4b5cbf01:faa2e4234c7a | |||
112 | updating to branch default |
|
121 | updating to branch default | |
113 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 | checking changesets |
|
123 | checking changesets | |
@@ -120,6 +129,7 b' clone remote via stream' | |||||
120 | adding manifests |
|
129 | adding manifests | |
121 | adding file changes |
|
130 | adding file changes | |
122 | added 5 changesets with 5 changes to 2 files |
|
131 | added 5 changesets with 5 changes to 2 files | |
|
132 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
123 | updating to branch default |
|
133 | updating to branch default | |
124 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
134 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | checking changesets |
|
135 | checking changesets | |
@@ -135,6 +145,7 b' clone remote via stream' | |||||
135 | adding manifests |
|
145 | adding manifests | |
136 | adding file changes |
|
146 | adding file changes | |
137 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
147 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
|
148 | new changesets c70afb1ee985:faa2e4234c7a | |||
138 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
149 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
139 | $ hg verify |
|
150 | $ hg verify | |
140 | checking changesets |
|
151 | checking changesets | |
@@ -151,6 +162,7 b' clone remote via stream' | |||||
151 | adding manifests |
|
162 | adding manifests | |
152 | adding file changes |
|
163 | adding file changes | |
153 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
164 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
165 | new changesets c70afb1ee985 | |||
154 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
166 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
155 | $ hg verify |
|
167 | $ hg verify | |
156 | checking changesets |
|
168 | checking changesets | |
@@ -165,6 +177,7 b' clone remote via stream' | |||||
165 | adding manifests |
|
177 | adding manifests | |
166 | adding file changes |
|
178 | adding file changes | |
167 | added 6 changesets with 5 changes to 4 files |
|
179 | added 6 changesets with 5 changes to 4 files | |
|
180 | new changesets 4ce51a113780:916f1afdef90 | |||
168 | (run 'hg update' to get a working copy) |
|
181 | (run 'hg update' to get a working copy) | |
169 | $ cd .. |
|
182 | $ cd .. | |
170 | $ cd test-2 |
|
183 | $ cd test-2 | |
@@ -175,6 +188,7 b' clone remote via stream' | |||||
175 | adding manifests |
|
188 | adding manifests | |
176 | adding file changes |
|
189 | adding file changes | |
177 | added 2 changesets with 0 changes to 0 files (+1 heads) |
|
190 | added 2 changesets with 0 changes to 0 files (+1 heads) | |
|
191 | new changesets c70afb1ee985:f03ae5a9b979 | |||
178 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
192 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
179 | $ hg verify |
|
193 | $ hg verify | |
180 | checking changesets |
|
194 | checking changesets | |
@@ -189,6 +203,7 b' clone remote via stream' | |||||
189 | adding manifests |
|
203 | adding manifests | |
190 | adding file changes |
|
204 | adding file changes | |
191 | added 4 changesets with 4 changes to 4 files |
|
205 | added 4 changesets with 4 changes to 4 files | |
|
206 | new changesets 93ee6ab32777:916f1afdef90 | |||
192 | (run 'hg update' to get a working copy) |
|
207 | (run 'hg update' to get a working copy) | |
193 | $ hg verify |
|
208 | $ hg verify | |
194 | checking changesets |
|
209 | checking changesets |
@@ -39,6 +39,7 b' url for proxy, pull' | |||||
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 1 changesets with 1 changes to 1 files |
|
41 | added 1 changesets with 1 changes to 1 files | |
|
42 | new changesets 83180e7845de | |||
42 | updating to branch default |
|
43 | updating to branch default | |
43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | $ cd b-pull |
|
45 | $ cd b-pull | |
@@ -58,6 +59,7 b' host:port for proxy' | |||||
58 | adding manifests |
|
59 | adding manifests | |
59 | adding file changes |
|
60 | adding file changes | |
60 | added 1 changesets with 1 changes to 1 files |
|
61 | added 1 changesets with 1 changes to 1 files | |
|
62 | new changesets 83180e7845de | |||
61 | updating to branch default |
|
63 | updating to branch default | |
62 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
63 |
|
65 | |||
@@ -69,6 +71,7 b' proxy url with user name and password' | |||||
69 | adding manifests |
|
71 | adding manifests | |
70 | adding file changes |
|
72 | adding file changes | |
71 | added 1 changesets with 1 changes to 1 files |
|
73 | added 1 changesets with 1 changes to 1 files | |
|
74 | new changesets 83180e7845de | |||
72 | updating to branch default |
|
75 | updating to branch default | |
73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
74 |
|
77 | |||
@@ -80,6 +83,7 b' url with user name and password' | |||||
80 | adding manifests |
|
83 | adding manifests | |
81 | adding file changes |
|
84 | adding file changes | |
82 | added 1 changesets with 1 changes to 1 files |
|
85 | added 1 changesets with 1 changes to 1 files | |
|
86 | new changesets 83180e7845de | |||
83 | updating to branch default |
|
87 | updating to branch default | |
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
88 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 |
|
89 | |||
@@ -98,6 +102,7 b' do not use the proxy if it is in the no ' | |||||
98 | adding manifests |
|
102 | adding manifests | |
99 | adding file changes |
|
103 | adding file changes | |
100 | added 1 changesets with 1 changes to 1 files |
|
104 | added 1 changesets with 1 changes to 1 files | |
|
105 | new changesets 83180e7845de | |||
101 | updating to branch default |
|
106 | updating to branch default | |
102 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
107 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
103 | $ cat proxy.log |
|
108 | $ cat proxy.log |
@@ -55,6 +55,7 b' try to clone via stream, should use pull' | |||||
55 | adding manifests |
|
55 | adding manifests | |
56 | adding file changes |
|
56 | adding file changes | |
57 | added 1 changesets with 4 changes to 4 files |
|
57 | added 1 changesets with 4 changes to 4 files | |
|
58 | new changesets 8b6053c928fe | |||
58 | updating to branch default |
|
59 | updating to branch default | |
59 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 |
|
61 | |||
@@ -74,6 +75,7 b' try to clone via stream but missing requ' | |||||
74 | adding manifests |
|
75 | adding manifests | |
75 | adding file changes |
|
76 | adding file changes | |
76 | added 1 changesets with 4 changes to 4 files |
|
77 | added 1 changesets with 4 changes to 4 files | |
|
78 | new changesets 8b6053c928fe | |||
77 | updating to branch default |
|
79 | updating to branch default | |
78 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 |
|
81 | |||
@@ -85,6 +87,7 b' clone via pull' | |||||
85 | adding manifests |
|
87 | adding manifests | |
86 | adding file changes |
|
88 | adding file changes | |
87 | added 1 changesets with 4 changes to 4 files |
|
89 | added 1 changesets with 4 changes to 4 files | |
|
90 | new changesets 8b6053c928fe | |||
88 | updating to branch default |
|
91 | updating to branch default | |
89 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
92 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
90 | $ hg verify -R copy-pull |
|
93 | $ hg verify -R copy-pull | |
@@ -107,6 +110,7 b' clone over http with --update' | |||||
107 | adding manifests |
|
110 | adding manifests | |
108 | adding file changes |
|
111 | adding file changes | |
109 | added 2 changesets with 5 changes to 5 files |
|
112 | added 2 changesets with 5 changes to 5 files | |
|
113 | new changesets 8b6053c928fe:5fed3813f7f5 | |||
110 | updating to branch default |
|
114 | updating to branch default | |
111 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
115 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
112 | $ hg log -r . -R updated |
|
116 | $ hg log -r . -R updated | |
@@ -124,6 +128,7 b' incoming via HTTP' | |||||
124 | adding manifests |
|
128 | adding manifests | |
125 | adding file changes |
|
129 | adding file changes | |
126 | added 1 changesets with 4 changes to 4 files |
|
130 | added 1 changesets with 4 changes to 4 files | |
|
131 | new changesets 8b6053c928fe | |||
127 | updating to branch default |
|
132 | updating to branch default | |
128 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 | $ cd partial |
|
134 | $ cd partial | |
@@ -149,6 +154,7 b' pull' | |||||
149 | adding manifests |
|
154 | adding manifests | |
150 | adding file changes |
|
155 | adding file changes | |
151 | added 1 changesets with 1 changes to 1 files |
|
156 | added 1 changesets with 1 changes to 1 files | |
|
157 | new changesets 5fed3813f7f5 | |||
152 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/ |
|
158 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT1/ | |
153 | (run 'hg update' to get a working copy) |
|
159 | (run 'hg update' to get a working copy) | |
154 | $ cd .. |
|
160 | $ cd .. | |
@@ -227,6 +233,7 b' test http authentication' | |||||
227 | adding manifests |
|
233 | adding manifests | |
228 | adding file changes |
|
234 | adding file changes | |
229 | added 2 changesets with 5 changes to 5 files |
|
235 | added 2 changesets with 5 changes to 5 files | |
|
236 | new changesets 8b6053c928fe:5fed3813f7f5 | |||
230 | updating to branch default |
|
237 | updating to branch default | |
231 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
238 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
232 |
|
239 | |||
@@ -325,6 +332,7 b' clone of serve with repo in root and uns' | |||||
325 | adding manifests |
|
332 | adding manifests | |
326 | adding file changes |
|
333 | adding file changes | |
327 | added 3 changesets with 7 changes to 7 files |
|
334 | added 3 changesets with 7 changes to 7 files | |
|
335 | new changesets 8b6053c928fe:56f9bc90cce6 | |||
328 | updating to branch default |
|
336 | updating to branch default | |
329 | abort: HTTP Error 404: Not Found |
|
337 | abort: HTTP Error 404: Not Found | |
330 | [255] |
|
338 | [255] | |
@@ -334,6 +342,7 b' clone of serve with repo in root and uns' | |||||
334 | adding manifests |
|
342 | adding manifests | |
335 | adding file changes |
|
343 | adding file changes | |
336 | added 3 changesets with 7 changes to 7 files |
|
344 | added 3 changesets with 7 changes to 7 files | |
|
345 | new changesets 8b6053c928fe:56f9bc90cce6 | |||
337 | updating to branch default |
|
346 | updating to branch default | |
338 | abort: HTTP Error 404: Not Found |
|
347 | abort: HTTP Error 404: Not Found | |
339 | [255] |
|
348 | [255] | |
@@ -381,6 +390,7 b' disable pull-based clones' | |||||
381 | adding manifests |
|
390 | adding manifests | |
382 | adding file changes |
|
391 | adding file changes | |
383 | added 1 changesets with 4 changes to 4 files |
|
392 | added 1 changesets with 4 changes to 4 files | |
|
393 | new changesets 8b6053c928fe | |||
384 | updating to branch default |
|
394 | updating to branch default | |
385 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
395 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
386 | $ hg pull -R test-partial-clone |
|
396 | $ hg pull -R test-partial-clone | |
@@ -390,6 +400,7 b' disable pull-based clones' | |||||
390 | adding manifests |
|
400 | adding manifests | |
391 | adding file changes |
|
401 | adding file changes | |
392 | added 2 changesets with 3 changes to 3 files |
|
402 | added 2 changesets with 3 changes to 3 files | |
|
403 | new changesets 5fed3813f7f5:56f9bc90cce6 | |||
393 | (run 'hg update' to get a working copy) |
|
404 | (run 'hg update' to get a working copy) | |
394 |
|
405 | |||
395 | corrupt cookies file should yield a warning |
|
406 | corrupt cookies file should yield a warning |
@@ -148,6 +148,7 b' A per-host certificate matching the serv' | |||||
148 | adding manifests |
|
148 | adding manifests | |
149 | adding file changes |
|
149 | adding file changes | |
150 | added 1 changesets with 4 changes to 4 files |
|
150 | added 1 changesets with 4 changes to 4 files | |
|
151 | new changesets 8b6053c928fe | |||
151 |
|
152 | |||
152 | A per-host certificate with multiple certs and one matching will be accepted |
|
153 | A per-host certificate with multiple certs and one matching will be accepted | |
153 |
|
154 | |||
@@ -159,6 +160,7 b' A per-host certificate with multiple cer' | |||||
159 | adding manifests |
|
160 | adding manifests | |
160 | adding file changes |
|
161 | adding file changes | |
161 | added 1 changesets with 4 changes to 4 files |
|
162 | added 1 changesets with 4 changes to 4 files | |
|
163 | new changesets 8b6053c928fe | |||
162 |
|
164 | |||
163 | Defining both per-host certificate and a fingerprint will print a warning |
|
165 | Defining both per-host certificate and a fingerprint will print a warning | |
164 |
|
166 | |||
@@ -170,6 +172,7 b' Defining both per-host certificate and a' | |||||
170 | adding manifests |
|
172 | adding manifests | |
171 | adding file changes |
|
173 | adding file changes | |
172 | added 1 changesets with 4 changes to 4 files |
|
174 | added 1 changesets with 4 changes to 4 files | |
|
175 | new changesets 8b6053c928fe | |||
173 |
|
176 | |||
174 | $ DISABLECACERTS="--config devel.disableloaddefaultcerts=true" |
|
177 | $ DISABLECACERTS="--config devel.disableloaddefaultcerts=true" | |
175 |
|
178 | |||
@@ -189,6 +192,7 b' Inability to verify peer certificate wil' | |||||
189 | adding manifests |
|
192 | adding manifests | |
190 | adding file changes |
|
193 | adding file changes | |
191 | added 1 changesets with 4 changes to 4 files |
|
194 | added 1 changesets with 4 changes to 4 files | |
|
195 | new changesets 8b6053c928fe | |||
192 | updating to branch default |
|
196 | updating to branch default | |
193 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
197 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
194 | $ hg verify -R copy-pull |
|
198 | $ hg verify -R copy-pull | |
@@ -226,6 +230,7 b' pull without cacert' | |||||
226 | adding manifests |
|
230 | adding manifests | |
227 | adding file changes |
|
231 | adding file changes | |
228 | added 1 changesets with 1 changes to 1 files |
|
232 | added 1 changesets with 1 changes to 1 files | |
|
233 | new changesets 5fed3813f7f5 | |||
229 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=https://localhost:$HGPORT/ |
|
234 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_NODE_LAST=5fed3813f7f5e1824344fdc9cf8f63bb662c292d HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=https://localhost:$HGPORT/ | |
230 | (run 'hg update' to get a working copy) |
|
235 | (run 'hg update' to get a working copy) | |
231 | $ cd .. |
|
236 | $ cd .. |
@@ -266,6 +266,7 b' Test applying multiple patches' | |||||
266 | adding manifests |
|
266 | adding manifests | |
267 | adding file changes |
|
267 | adding file changes | |
268 | added 2 changesets with 2 changes to 1 files |
|
268 | added 2 changesets with 2 changes to 1 files | |
|
269 | new changesets 07f494440405:4e322f7ce8e3 | |||
269 | updating to branch foo |
|
270 | updating to branch foo | |
270 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
271 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
271 | $ cd repo-multi1 |
|
272 | $ cd repo-multi1 | |
@@ -292,6 +293,7 b' Test applying multiple patches with --ex' | |||||
292 | adding manifests |
|
293 | adding manifests | |
293 | adding file changes |
|
294 | adding file changes | |
294 | added 2 changesets with 2 changes to 1 files |
|
295 | added 2 changesets with 2 changes to 1 files | |
|
296 | new changesets 07f494440405:4e322f7ce8e3 | |||
295 | updating to branch foo |
|
297 | updating to branch foo | |
296 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
298 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
297 | $ cd repo-multi2 |
|
299 | $ cd repo-multi2 |
@@ -37,6 +37,7 b' Test import and merge diffs' | |||||
37 | adding manifests |
|
37 | adding manifests | |
38 | adding file changes |
|
38 | adding file changes | |
39 | added 3 changesets with 3 changes to 2 files |
|
39 | added 3 changesets with 3 changes to 2 files | |
|
40 | new changesets 07f494440405:890ecaa90481 | |||
40 | updating to branch default |
|
41 | updating to branch default | |
41 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
42 | $ cd repo2 |
|
43 | $ cd repo2 | |
@@ -47,6 +48,7 b' Test import and merge diffs' | |||||
47 | adding manifests |
|
48 | adding manifests | |
48 | adding file changes |
|
49 | adding file changes | |
49 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
50 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
51 | new changesets 102a90ea7b4a | |||
50 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
52 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
51 |
|
53 | |||
52 | Test without --exact and diff.p1 == workingdir.p1 |
|
54 | Test without --exact and diff.p1 == workingdir.p1 |
@@ -31,6 +31,7 b" commit message and '--edit' is not speci" | |||||
31 | adding manifests |
|
31 | adding manifests | |
32 | adding file changes |
|
32 | adding file changes | |
33 | added 1 changesets with 2 changes to 2 files |
|
33 | added 1 changesets with 2 changes to 2 files | |
|
34 | new changesets 80971e65b431 | |||
34 | updating to branch default |
|
35 | updating to branch default | |
35 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 | $ HGEDITOR=cat hg --cwd b import ../exported-tip.patch |
|
37 | $ HGEDITOR=cat hg --cwd b import ../exported-tip.patch | |
@@ -62,6 +63,7 b' regardless of the commit message in the ' | |||||
62 | adding manifests |
|
63 | adding manifests | |
63 | adding file changes |
|
64 | adding file changes | |
64 | added 1 changesets with 2 changes to 2 files |
|
65 | added 1 changesets with 2 changes to 2 files | |
|
66 | new changesets 80971e65b431 | |||
65 | updating to branch default |
|
67 | updating to branch default | |
66 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
67 | $ HGEDITOR=cat hg --config ui.patch="$PYTHON ../dummypatch.py" --cwd b import --edit ../exported-tip.patch |
|
69 | $ HGEDITOR=cat hg --config ui.patch="$PYTHON ../dummypatch.py" --cwd b import --edit ../exported-tip.patch | |
@@ -89,6 +91,7 b" the commit message, regardless of '--edi" | |||||
89 | adding manifests |
|
91 | adding manifests | |
90 | adding file changes |
|
92 | adding file changes | |
91 | added 1 changesets with 2 changes to 2 files |
|
93 | added 1 changesets with 2 changes to 2 files | |
|
94 | new changesets 80971e65b431 | |||
92 | updating to branch default |
|
95 | updating to branch default | |
93 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 | $ cat > $TESTTMP/editor.sh <<EOF |
|
97 | $ cat > $TESTTMP/editor.sh <<EOF | |
@@ -134,6 +137,7 b' import of plain diff should be ok with m' | |||||
134 | adding manifests |
|
137 | adding manifests | |
135 | adding file changes |
|
138 | adding file changes | |
136 | added 1 changesets with 2 changes to 2 files |
|
139 | added 1 changesets with 2 changes to 2 files | |
|
140 | new changesets 80971e65b431 | |||
137 | updating to branch default |
|
141 | updating to branch default | |
138 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
142 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
139 | $ hg --cwd b import -mpatch ../diffed-tip.patch |
|
143 | $ hg --cwd b import -mpatch ../diffed-tip.patch | |
@@ -150,6 +154,7 b' import of plain diff with specific date ' | |||||
150 | adding manifests |
|
154 | adding manifests | |
151 | adding file changes |
|
155 | adding file changes | |
152 | added 1 changesets with 2 changes to 2 files |
|
156 | added 1 changesets with 2 changes to 2 files | |
|
157 | new changesets 80971e65b431 | |||
153 | updating to branch default |
|
158 | updating to branch default | |
154 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
155 | $ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch |
|
160 | $ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch | |
@@ -183,6 +188,7 b" specified, regardless of '--edit')" | |||||
183 | adding manifests |
|
188 | adding manifests | |
184 | adding file changes |
|
189 | adding file changes | |
185 | added 1 changesets with 2 changes to 2 files |
|
190 | added 1 changesets with 2 changes to 2 files | |
|
191 | new changesets 80971e65b431 | |||
186 | updating to branch default |
|
192 | updating to branch default | |
187 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
193 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
188 | $ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch |
|
194 | $ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch | |
@@ -204,6 +210,7 b' import of malformed plain diff should fa' | |||||
204 | adding manifests |
|
210 | adding manifests | |
205 | adding file changes |
|
211 | adding file changes | |
206 | added 1 changesets with 2 changes to 2 files |
|
212 | added 1 changesets with 2 changes to 2 files | |
|
213 | new changesets 80971e65b431 | |||
207 | updating to branch default |
|
214 | updating to branch default | |
208 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
215 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
209 | $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch |
|
216 | $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch | |
@@ -224,6 +231,7 b' used to hide a bug.' | |||||
224 | adding manifests |
|
231 | adding manifests | |
225 | adding file changes |
|
232 | adding file changes | |
226 | added 1 changesets with 2 changes to 2 files |
|
233 | added 1 changesets with 2 changes to 2 files | |
|
234 | new changesets 80971e65b431 | |||
227 | updating to branch default |
|
235 | updating to branch default | |
228 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
236 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
229 | $ cd dir |
|
237 | $ cd dir | |
@@ -240,6 +248,7 b' import from stdin' | |||||
240 | adding manifests |
|
248 | adding manifests | |
241 | adding file changes |
|
249 | adding file changes | |
242 | added 1 changesets with 2 changes to 2 files |
|
250 | added 1 changesets with 2 changes to 2 files | |
|
251 | new changesets 80971e65b431 | |||
243 | updating to branch default |
|
252 | updating to branch default | |
244 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
253 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
245 | $ hg --cwd b import - < exported-tip.patch |
|
254 | $ hg --cwd b import - < exported-tip.patch | |
@@ -266,6 +275,7 b' override commit message' | |||||
266 | adding manifests |
|
275 | adding manifests | |
267 | adding file changes |
|
276 | adding file changes | |
268 | added 1 changesets with 2 changes to 2 files |
|
277 | added 1 changesets with 2 changes to 2 files | |
|
278 | new changesets 80971e65b431 | |||
269 | updating to branch default |
|
279 | updating to branch default | |
270 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
280 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
271 | $ hg --cwd b import -m 'override' - < exported-tip.patch |
|
281 | $ hg --cwd b import -m 'override' - < exported-tip.patch | |
@@ -292,6 +302,7 b' plain diff in email, subject, message bo' | |||||
292 | adding manifests |
|
302 | adding manifests | |
293 | adding file changes |
|
303 | adding file changes | |
294 | added 1 changesets with 2 changes to 2 files |
|
304 | added 1 changesets with 2 changes to 2 files | |
|
305 | new changesets 80971e65b431 | |||
295 | updating to branch default |
|
306 | updating to branch default | |
296 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
307 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
297 | $ $PYTHON mkmsg.py diffed-tip.patch msg.patch |
|
308 | $ $PYTHON mkmsg.py diffed-tip.patch msg.patch | |
@@ -310,6 +321,7 b' plain diff in email, no subject, message' | |||||
310 | adding manifests |
|
321 | adding manifests | |
311 | adding file changes |
|
322 | adding file changes | |
312 | added 1 changesets with 2 changes to 2 files |
|
323 | added 1 changesets with 2 changes to 2 files | |
|
324 | new changesets 80971e65b431 | |||
313 | updating to branch default |
|
325 | updating to branch default | |
314 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
326 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
315 | $ grep -v '^Subject:' msg.patch | hg --cwd b import - |
|
327 | $ grep -v '^Subject:' msg.patch | hg --cwd b import - | |
@@ -324,6 +336,7 b' plain diff in email, subject, no message' | |||||
324 | adding manifests |
|
336 | adding manifests | |
325 | adding file changes |
|
337 | adding file changes | |
326 | added 1 changesets with 2 changes to 2 files |
|
338 | added 1 changesets with 2 changes to 2 files | |
|
339 | new changesets 80971e65b431 | |||
327 | updating to branch default |
|
340 | updating to branch default | |
328 | 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 | |
329 | $ grep -v '^email ' msg.patch | hg --cwd b import - |
|
342 | $ grep -v '^email ' msg.patch | hg --cwd b import - | |
@@ -338,6 +351,7 b' plain diff in email, no subject, no mess' | |||||
338 | adding manifests |
|
351 | adding manifests | |
339 | adding file changes |
|
352 | adding file changes | |
340 | added 1 changesets with 2 changes to 2 files |
|
353 | added 1 changesets with 2 changes to 2 files | |
|
354 | new changesets 80971e65b431 | |||
341 | updating to branch default |
|
355 | updating to branch default | |
342 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
356 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
343 | $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - |
|
357 | $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - | |
@@ -354,6 +368,7 b' hg export in email, should use patch hea' | |||||
354 | adding manifests |
|
368 | adding manifests | |
355 | adding file changes |
|
369 | adding file changes | |
356 | added 1 changesets with 2 changes to 2 files |
|
370 | added 1 changesets with 2 changes to 2 files | |
|
371 | new changesets 80971e65b431 | |||
357 | updating to branch default |
|
372 | updating to branch default | |
358 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
373 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
359 | $ $PYTHON mkmsg.py exported-tip.patch msg.patch |
|
374 | $ $PYTHON mkmsg.py exported-tip.patch msg.patch | |
@@ -385,6 +400,7 b' plain diff in email, [PATCH] subject, me' | |||||
385 | adding manifests |
|
400 | adding manifests | |
386 | adding file changes |
|
401 | adding file changes | |
387 | added 1 changesets with 2 changes to 2 files |
|
402 | added 1 changesets with 2 changes to 2 files | |
|
403 | new changesets 80971e65b431 | |||
388 | updating to branch default |
|
404 | updating to branch default | |
389 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
405 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
390 | $ $PYTHON mkmsg2.py diffed-tip.patch msg.patch |
|
406 | $ $PYTHON mkmsg2.py diffed-tip.patch msg.patch | |
@@ -653,6 +669,7 b' hg import in a subdirectory' | |||||
653 | adding manifests |
|
669 | adding manifests | |
654 | adding file changes |
|
670 | adding file changes | |
655 | added 1 changesets with 2 changes to 2 files |
|
671 | added 1 changesets with 2 changes to 2 files | |
|
672 | new changesets 80971e65b431 | |||
656 | updating to branch default |
|
673 | updating to branch default | |
657 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
674 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
658 | $ hg --cwd a export tip > tmp |
|
675 | $ hg --cwd a export tip > tmp |
@@ -329,12 +329,14 b' test the resulting bundles' | |||||
329 | adding manifests |
|
329 | adding manifests | |
330 | adding file changes |
|
330 | adding file changes | |
331 | added 9 changesets with 9 changes to 1 files |
|
331 | added 9 changesets with 9 changes to 1 files | |
|
332 | new changesets 00a43fa82f62:e4feb4ac9035 | |||
332 | (run 'hg update' to get a working copy) |
|
333 | (run 'hg update' to get a working copy) | |
333 | $ hg -R temp2 unbundle test2.hg |
|
334 | $ hg -R temp2 unbundle test2.hg | |
334 | adding changesets |
|
335 | adding changesets | |
335 | adding manifests |
|
336 | adding manifests | |
336 | adding file changes |
|
337 | adding file changes | |
337 | added 9 changesets with 9 changes to 1 files |
|
338 | added 9 changesets with 9 changes to 1 files | |
|
339 | new changesets 00a43fa82f62:e4feb4ac9035 | |||
338 | (run 'hg update' to get a working copy) |
|
340 | (run 'hg update' to get a working copy) | |
339 | $ hg -R temp tip |
|
341 | $ hg -R temp tip | |
340 | changeset: 8:e4feb4ac9035 |
|
342 | changeset: 8:e4feb4ac9035 |
@@ -47,6 +47,7 b' Try cloning -r branch:' | |||||
47 | adding manifests |
|
47 | adding manifests | |
48 | adding file changes |
|
48 | adding file changes | |
49 | added 3 changesets with 2 changes to 2 files |
|
49 | added 3 changesets with 2 changes to 2 files | |
|
50 | new changesets cb9a9f314b8b:ae3d9c30ec50 | |||
50 | updating to branch br |
|
51 | updating to branch br | |
51 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
52 |
|
53 | |||
@@ -66,6 +67,7 b' Try cloning -rother clone#branch:' | |||||
66 | adding manifests |
|
67 | adding manifests | |
67 | adding file changes |
|
68 | adding file changes | |
68 | added 3 changesets with 2 changes to 2 files |
|
69 | added 3 changesets with 2 changes to 2 files | |
|
70 | new changesets cb9a9f314b8b:ae3d9c30ec50 | |||
69 | updating to branch default |
|
71 | updating to branch default | |
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
71 |
|
73 | |||
@@ -83,6 +85,7 b' Try cloning -r1 clone#branch:' | |||||
83 | adding manifests |
|
85 | adding manifests | |
84 | adding file changes |
|
86 | adding file changes | |
85 | added 3 changesets with 2 changes to 2 files |
|
87 | added 3 changesets with 2 changes to 2 files | |
|
88 | new changesets cb9a9f314b8b:ae3d9c30ec50 | |||
86 | updating to branch br |
|
89 | updating to branch br | |
87 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 |
|
91 |
@@ -19,6 +19,7 b' Initialize repository' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
21 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
22 | new changesets 273d008d6e8e | |||
22 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
23 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
23 |
|
24 | |||
24 | $ hg -R foo1 book branchy |
|
25 | $ hg -R foo1 book branchy | |
@@ -35,6 +36,7 b' Pull. Bookmark should not jump to new he' | |||||
35 | adding manifests |
|
36 | adding manifests | |
36 | adding file changes |
|
37 | adding file changes | |
37 | added 1 changesets with 1 changes to 1 files |
|
38 | added 1 changesets with 1 changes to 1 files | |
|
39 | new changesets 84a798d48b17 | |||
38 | (run 'hg update' to get a working copy) |
|
40 | (run 'hg update' to get a working copy) | |
39 |
|
41 | |||
40 | $ hg -R foo1 book |
|
42 | $ hg -R foo1 book |
@@ -43,6 +43,7 b' Create extension that can disable exec c' | |||||
43 | adding manifests |
|
43 | adding manifests | |
44 | adding file changes |
|
44 | adding file changes | |
45 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
45 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
46 | new changesets 2d8bcf2dda39 | |||
46 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
47 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
47 |
|
48 | |||
48 | $ hg manifest -v -r tip |
|
49 | $ hg manifest -v -r tip |
@@ -22,6 +22,7 b' dirstate' | |||||
22 | adding manifests |
|
22 | adding manifests | |
23 | adding file changes |
|
23 | adding file changes | |
24 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
24 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
25 | new changesets cb9a9f314b8b | |||
25 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
26 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
26 | $ hg merge |
|
27 | $ hg merge | |
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -57,6 +58,7 b' create test repos' | |||||
57 | adding manifests |
|
58 | adding manifests | |
58 | adding file changes |
|
59 | adding file changes | |
59 | added 1 changesets with 1 changes to 1 files |
|
60 | added 1 changesets with 1 changes to 1 files | |
|
61 | new changesets 7132ab4568ac | |||
60 | (run 'hg update' to get a working copy) |
|
62 | (run 'hg update' to get a working copy) | |
61 | $ hg update |
|
63 | $ hg update | |
62 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -72,6 +74,7 b' create test repos' | |||||
72 | adding manifests |
|
74 | adding manifests | |
73 | adding file changes |
|
75 | adding file changes | |
74 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
76 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
77 | new changesets 5ddceb349652 | |||
75 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
78 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
76 |
|
79 | |||
77 | merge both repos |
|
80 | merge both repos |
@@ -125,6 +125,7 b' A bundle to test this was made with:' | |||||
125 | adding manifests |
|
125 | adding manifests | |
126 | adding file changes |
|
126 | adding file changes | |
127 | added 1 changesets with 1 changes to 1 files |
|
127 | added 1 changesets with 1 changes to 1 files | |
|
128 | new changesets a2392c293916 | |||
128 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 |
|
130 | |||
130 | $ echo 'expand $Id$' > a |
|
131 | $ echo 'expand $Id$' > a | |
@@ -260,6 +261,7 b' Pull from bundle and trigger notify' | |||||
260 | adding manifests |
|
261 | adding manifests | |
261 | adding file changes |
|
262 | adding file changes | |
262 | added 2 changesets with 3 changes to 3 files |
|
263 | added 2 changesets with 3 changes to 3 files | |
|
264 | new changesets a2392c293916:ef63ca68695b | |||
263 | MIME-Version: 1.0 |
|
265 | MIME-Version: 1.0 | |
264 | Content-Type: text/plain; charset="us-ascii" |
|
266 | Content-Type: text/plain; charset="us-ascii" | |
265 | Content-Transfer-Encoding: 7bit |
|
267 | Content-Transfer-Encoding: 7bit | |
@@ -918,6 +920,7 b' Clone to test incoming' | |||||
918 | adding manifests |
|
920 | adding manifests | |
919 | adding file changes |
|
921 | adding file changes | |
920 | added 2 changesets with 3 changes to 3 files |
|
922 | added 2 changesets with 3 changes to 3 files | |
|
923 | new changesets a2392c293916:ef63ca68695b | |||
921 | updating to branch default |
|
924 | updating to branch default | |
922 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
925 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
923 | $ cd Test-a |
|
926 | $ cd Test-a |
@@ -45,6 +45,7 b' repo as "default" path in .hg/hgrc.' | |||||
45 | adding manifests |
|
45 | adding manifests | |
46 | adding file changes |
|
46 | adding file changes | |
47 | added 2 changesets with 1 changes to 1 files |
|
47 | added 2 changesets with 1 changes to 1 files | |
|
48 | new changesets eb85d9124f3f:26c18ce05e4e | |||
48 | (run 'hg update' to get a working copy) |
|
49 | (run 'hg update' to get a working copy) | |
49 |
|
50 | |||
50 | Update working directory to "tip", which requires largefile("large"), |
|
51 | Update working directory to "tip", which requires largefile("large"), | |
@@ -86,6 +87,7 b' Verify that largefiles from pulled branc' | |||||
86 | adding manifests |
|
87 | adding manifests | |
87 | adding file changes |
|
88 | adding file changes | |
88 | added 1 changesets with 1 changes to 1 files |
|
89 | added 1 changesets with 1 changes to 1 files | |
|
90 | new changesets eb85d9124f3f | |||
89 | (run 'hg update' to get a working copy) |
|
91 | (run 'hg update' to get a working copy) | |
90 |
|
92 | |||
91 | #if unix-permissions |
|
93 | #if unix-permissions |
@@ -111,6 +111,7 b' We have to simulate that here by setting' | |||||
111 | adding manifests |
|
111 | adding manifests | |
112 | adding file changes |
|
112 | adding file changes | |
113 | added 1 changesets with 1 changes to 1 files |
|
113 | added 1 changesets with 1 changes to 1 files | |
|
114 | new changesets 09a186cfa6da | |||
114 | updating to branch default |
|
115 | updating to branch default | |
115 | getting changed largefiles |
|
116 | getting changed largefiles | |
116 | 1 largefiles updated, 0 removed |
|
117 | 1 largefiles updated, 0 removed | |
@@ -1113,6 +1114,7 b' Test "pull --rebase" when rebase is enab' | |||||
1113 | adding manifests |
|
1114 | adding manifests | |
1114 | adding file changes |
|
1115 | adding file changes | |
1115 | added 1 changesets with 1 changes to 1 files |
|
1116 | added 1 changesets with 1 changes to 1 files | |
|
1117 | new changesets bf5e395ced2c | |||
1116 | nothing to rebase - updating instead |
|
1118 | nothing to rebase - updating instead | |
1117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1119 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1118 |
|
1120 |
@@ -63,6 +63,7 b' makes copies instead of hardlinks:' | |||||
63 | adding manifests |
|
63 | adding manifests | |
64 | adding file changes |
|
64 | adding file changes | |
65 | added 1 changesets with 1 changes to 1 files |
|
65 | added 1 changesets with 1 changes to 1 files | |
|
66 | new changesets 390cf214e9ac | |||
66 | updating to branch default |
|
67 | updating to branch default | |
67 | getting changed largefiles |
|
68 | getting changed largefiles | |
68 | abort: No space left on device |
|
69 | abort: No space left on device |
@@ -458,6 +458,7 b' Test that the internal linear merging wo' | |||||
458 | adding manifests |
|
458 | adding manifests | |
459 | adding file changes |
|
459 | adding file changes | |
460 | added 3 changesets with 5 changes to 5 files |
|
460 | added 3 changesets with 5 changes to 5 files | |
|
461 | new changesets 9530e27857f7:d65e59e952a9 | |||
461 | remote turned local largefile large2 into a normal file |
|
462 | remote turned local largefile large2 into a normal file | |
462 | keep (l)argefile or use (n)ormal file? l |
|
463 | keep (l)argefile or use (n)ormal file? l | |
463 | largefile large1 has a merge conflict |
|
464 | largefile large1 has a merge conflict | |
@@ -493,6 +494,7 b' Test that the internal linear merging wo' | |||||
493 | adding manifests |
|
494 | adding manifests | |
494 | adding file changes |
|
495 | adding file changes | |
495 | added 3 changesets with 5 changes to 5 files |
|
496 | added 3 changesets with 5 changes to 5 files | |
|
497 | new changesets 9530e27857f7:d65e59e952a9 | |||
496 | remote turned local largefile large2 into a normal file |
|
498 | remote turned local largefile large2 into a normal file | |
497 | keep (l)argefile or use (n)ormal file? l |
|
499 | keep (l)argefile or use (n)ormal file? l | |
498 | largefile large1 has a merge conflict |
|
500 | largefile large1 has a merge conflict |
@@ -41,6 +41,7 b' vanilla clients not locked out from larg' | |||||
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 1 changesets with 1 changes to 1 files |
|
43 | added 1 changesets with 1 changes to 1 files | |
|
44 | new changesets b6eb3a2e2efe | |||
44 | updating to branch default |
|
45 | updating to branch default | |
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
46 |
|
47 | |||
@@ -53,6 +54,7 b' largefiles clients still work with vanil' | |||||
53 | adding manifests |
|
54 | adding manifests | |
54 | adding file changes |
|
55 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
56 | added 1 changesets with 1 changes to 1 files | |
|
57 | new changesets b6eb3a2e2efe | |||
56 | updating to branch default |
|
58 | updating to branch default | |
57 | 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 | |
58 | #endif |
|
60 | #endif | |
@@ -224,6 +226,7 b' Clone over http, no largefiles pulled on' | |||||
224 | adding manifests |
|
226 | adding manifests | |
225 | adding file changes |
|
227 | adding file changes | |
226 | added 1 changesets with 1 changes to 1 files |
|
228 | added 1 changesets with 1 changes to 1 files | |
|
229 | new changesets cf03e5bb9936 | |||
227 |
|
230 | |||
228 | Archive contains largefiles |
|
231 | Archive contains largefiles | |
229 | >>> import os |
|
232 | >>> import os | |
@@ -339,6 +342,7 b' largefiles should batch verify remote ca' | |||||
339 | adding manifests |
|
342 | adding manifests | |
340 | adding file changes |
|
343 | adding file changes | |
341 | added 2 changesets with 2 changes to 2 files |
|
344 | added 2 changesets with 2 changes to 2 files | |
|
345 | new changesets 567253b0f523:04d19c27a332 | |||
342 | $ hg -R batchverifyclone verify --large --lfa |
|
346 | $ hg -R batchverifyclone verify --large --lfa | |
343 | checking changesets |
|
347 | checking changesets | |
344 | checking manifests |
|
348 | checking manifests | |
@@ -375,6 +379,7 b' available locally.' | |||||
375 | adding manifests |
|
379 | adding manifests | |
376 | adding file changes |
|
380 | adding file changes | |
377 | added 1 changesets with 1 changes to 1 files |
|
381 | added 1 changesets with 1 changes to 1 files | |
|
382 | new changesets 6bba8cb6935d | |||
378 | (run 'hg update' to get a working copy) |
|
383 | (run 'hg update' to get a working copy) | |
379 | $ hg -R batchverifyclone verify --lfa |
|
384 | $ hg -R batchverifyclone verify --lfa | |
380 | checking changesets |
|
385 | checking changesets | |
@@ -437,6 +442,7 b' a large file from the server rather than' | |||||
437 | adding manifests |
|
442 | adding manifests | |
438 | adding file changes |
|
443 | adding file changes | |
439 | added 1 changesets with 1 changes to 1 files |
|
444 | added 1 changesets with 1 changes to 1 files | |
|
445 | new changesets 567253b0f523 | |||
440 | updating to branch default |
|
446 | updating to branch default | |
441 | getting changed largefiles |
|
447 | getting changed largefiles | |
442 | 1 largefiles updated, 0 removed |
|
448 | 1 largefiles updated, 0 removed |
@@ -961,6 +961,7 b' Test clone at revision' | |||||
961 | adding manifests |
|
961 | adding manifests | |
962 | adding file changes |
|
962 | adding file changes | |
963 | added 4 changesets with 10 changes to 4 files |
|
963 | added 4 changesets with 10 changes to 4 files | |
|
964 | new changesets 30d30fe6a5be:9e8fbc4bce62 | |||
964 | updating to branch default |
|
965 | updating to branch default | |
965 | getting changed largefiles |
|
966 | getting changed largefiles | |
966 | 2 largefiles updated, 0 removed |
|
967 | 2 largefiles updated, 0 removed | |
@@ -1089,6 +1090,7 b" downloaded from 'default' instead of 'de" | |||||
1089 | adding manifests |
|
1090 | adding manifests | |
1090 | adding file changes |
|
1091 | adding file changes | |
1091 | added 2 changesets with 8 changes to 4 files |
|
1092 | added 2 changesets with 8 changes to 4 files | |
|
1093 | new changesets 30d30fe6a5be:ce8896473775 | |||
1092 | updating to branch default |
|
1094 | updating to branch default | |
1093 | getting changed largefiles |
|
1095 | getting changed largefiles | |
1094 | 2 largefiles updated, 0 removed |
|
1096 | 2 largefiles updated, 0 removed | |
@@ -1102,6 +1104,7 b" downloaded from 'default' instead of 'de" | |||||
1102 | adding manifests |
|
1104 | adding manifests | |
1103 | adding file changes |
|
1105 | adding file changes | |
1104 | added 6 changesets with 16 changes to 8 files |
|
1106 | added 6 changesets with 16 changes to 8 files | |
|
1107 | new changesets 51a0ae4d5864:daea875e9014 | |||
1105 | (run 'hg update' to get a working copy) |
|
1108 | (run 'hg update' to get a working copy) | |
1106 | 6 largefiles cached |
|
1109 | 6 largefiles cached | |
1107 |
|
1110 | |||
@@ -1129,6 +1132,7 b' redo pull with --lfrev and check it pull' | |||||
1129 | adding manifests |
|
1132 | adding manifests | |
1130 | adding file changes |
|
1133 | adding file changes | |
1131 | added 6 changesets with 16 changes to 8 files |
|
1134 | added 6 changesets with 16 changes to 8 files | |
|
1135 | new changesets 51a0ae4d5864:daea875e9014 | |||
1132 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles |
|
1136 | calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles | |
1133 | (run 'hg update' to get a working copy) |
|
1137 | (run 'hg update' to get a working copy) | |
1134 | pulling largefiles for revision 7 |
|
1138 | pulling largefiles for revision 7 | |
@@ -1201,6 +1205,7 b' rebased or not.' | |||||
1201 | adding manifests |
|
1205 | adding manifests | |
1202 | adding file changes |
|
1206 | adding file changes | |
1203 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
1207 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
|
1208 | new changesets a381d2c8c80e | |||
1204 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" |
|
1209 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | |
1205 | Invoking status precommit hook |
|
1210 | Invoking status precommit hook | |
1206 | M sub/normal4 |
|
1211 | M sub/normal4 | |
@@ -1258,6 +1263,7 b' rebased or not.' | |||||
1258 | adding manifests |
|
1263 | adding manifests | |
1259 | adding file changes |
|
1264 | adding file changes | |
1260 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
1265 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
|
1266 | new changesets a381d2c8c80e | |||
1261 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1267 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1262 | $ hg rebase |
|
1268 | $ hg rebase | |
1263 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" |
|
1269 | rebasing 8:f574fb32bb45 "modify normal file largefile in repo d" | |
@@ -1663,6 +1669,7 b' correctly.' | |||||
1663 | adding manifests |
|
1669 | adding manifests | |
1664 | adding file changes |
|
1670 | adding file changes | |
1665 | added 8 changesets with 24 changes to 10 files |
|
1671 | added 8 changesets with 24 changes to 10 files | |
|
1672 | new changesets 30d30fe6a5be:daea875e9014 | |||
1666 | updating to branch default |
|
1673 | updating to branch default | |
1667 | getting changed largefiles |
|
1674 | getting changed largefiles | |
1668 | 3 largefiles updated, 0 removed |
|
1675 | 3 largefiles updated, 0 removed | |
@@ -1688,6 +1695,7 b' correctly.' | |||||
1688 | adding manifests |
|
1695 | adding manifests | |
1689 | adding file changes |
|
1696 | adding file changes | |
1690 | added 2 changesets with 4 changes to 4 files (+1 heads) |
|
1697 | added 2 changesets with 4 changes to 4 files (+1 heads) | |
|
1698 | new changesets a381d2c8c80e:598410d3eb9a | |||
1691 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1699 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1692 | 2 largefiles cached |
|
1700 | 2 largefiles cached | |
1693 | $ hg merge |
|
1701 | $ hg merge | |
@@ -1763,6 +1771,7 b' Test that transplanting a largefile chan' | |||||
1763 | adding manifests |
|
1771 | adding manifests | |
1764 | adding file changes |
|
1772 | adding file changes | |
1765 | added 9 changesets with 26 changes to 10 files |
|
1773 | added 9 changesets with 26 changes to 10 files | |
|
1774 | new changesets 30d30fe6a5be:a381d2c8c80e | |||
1766 | updating to branch default |
|
1775 | updating to branch default | |
1767 | getting changed largefiles |
|
1776 | getting changed largefiles | |
1768 | 3 largefiles updated, 0 removed |
|
1777 | 3 largefiles updated, 0 removed | |
@@ -1775,6 +1784,7 b' Test that transplanting a largefile chan' | |||||
1775 | adding manifests |
|
1784 | adding manifests | |
1776 | adding file changes |
|
1785 | adding file changes | |
1777 | added 1 changesets with 2 changes to 2 files |
|
1786 | added 1 changesets with 2 changes to 2 files | |
|
1787 | new changesets 598410d3eb9a | |||
1778 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1788 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
1779 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1789 | 9:598410d3eb9a modify normal file largefile in repo d | |
1780 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1790 | 8:a381d2c8c80e modify normal file and largefile in repo b |
@@ -26,6 +26,7 b' future commits.' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 1 changesets with 1 changes to 1 files |
|
28 | added 1 changesets with 1 changes to 1 files | |
|
29 | new changesets 0fc9a4fafa44 | |||
29 | updating to branch default |
|
30 | updating to branch default | |
30 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
31 | $ cd new |
|
32 | $ cd new |
@@ -104,6 +104,7 b' on the remote parent:' | |||||
104 | adding manifests |
|
104 | adding manifests | |
105 | adding file changes |
|
105 | adding file changes | |
106 | added 3 changesets with 3 changes to 2 files (+1 heads) |
|
106 | added 3 changesets with 3 changes to 2 files (+1 heads) | |
|
107 | new changesets 2665aaee66e9:0f2ff26688b9 | |||
107 |
$ |
|
108 | $ cd b | |
108 |
|
109 | |||
109 | $ hg up -C 1 |
|
110 | $ hg up -C 1 |
@@ -33,6 +33,7 b' but then local changes are added in the ' | |||||
33 | adding manifests |
|
33 | adding manifests | |
34 | adding file changes |
|
34 | adding file changes | |
35 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
35 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
36 | new changesets cc7000b01af9 | |||
36 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
37 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
37 | $ hg up -C 2 |
|
38 | $ hg up -C 2 | |
38 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
39 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -41,6 +41,7 b'' | |||||
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
43 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
44 | new changesets b90e70beeb58 | |||
44 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
45 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
45 | $ hg merge |
|
46 | $ hg merge | |
46 | 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 | |
@@ -58,6 +59,7 b' bar should remain deleted.' | |||||
58 | adding manifests |
|
59 | adding manifests | |
59 | adding file changes |
|
60 | adding file changes | |
60 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
61 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
62 | new changesets e1adc944e717 | |||
61 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
63 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
62 | $ hg merge |
|
64 | $ hg merge | |
63 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
65 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -41,6 +41,7 b' now pull and merge from test-a' | |||||
41 | adding manifests |
|
41 | adding manifests | |
42 | adding file changes |
|
42 | adding file changes | |
43 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
43 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
44 | new changesets 96b70246a118 | |||
44 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
45 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
45 | $ hg merge |
|
46 | $ hg merge | |
46 | merging test.txt |
|
47 | merging test.txt | |
@@ -77,6 +78,7 b' pull and merge from test-a again' | |||||
77 | adding manifests |
|
78 | adding manifests | |
78 | adding file changes |
|
79 | adding file changes | |
79 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
80 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
81 | new changesets 40d11a4173a8 | |||
80 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
82 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
81 | $ hg merge --debug |
|
83 | $ hg merge --debug | |
82 | searching for copies back to rev 1 |
|
84 | searching for copies back to rev 1 |
@@ -22,6 +22,7 b' Test for changeset ba7c74081861' | |||||
22 | adding manifests |
|
22 | adding manifests | |
23 | adding file changes |
|
23 | adding file changes | |
24 | added 2 changesets with 2 changes to 1 files |
|
24 | added 2 changesets with 2 changes to 1 files | |
|
25 | new changesets e3c9b40284e1:772b37f1ca37 | |||
25 | (run 'hg update' to get a working copy) |
|
26 | (run 'hg update' to get a working copy) | |
26 | $ hg update |
|
27 | $ hg update | |
27 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -88,6 +88,7 b' Pull queue bundle:' | |||||
88 | adding manifests |
|
88 | adding manifests | |
89 | adding file changes |
|
89 | adding file changes | |
90 | added 1 changesets with 3 changes to 3 files |
|
90 | added 1 changesets with 3 changes to 3 files | |
|
91 | new changesets d7553909353d | |||
91 | merging series |
|
92 | merging series | |
92 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
93 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
93 | $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true |
|
94 | $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true | |
@@ -119,6 +120,7 b' Unbundle queue bundle:' | |||||
119 | adding manifests |
|
120 | adding manifests | |
120 | adding file changes |
|
121 | adding file changes | |
121 | added 1 changesets with 3 changes to 3 files |
|
122 | added 1 changesets with 3 changes to 3 files | |
|
123 | new changesets d7553909353d | |||
122 | merging series |
|
124 | merging series | |
123 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
125 | 2 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
124 |
|
126 |
@@ -47,11 +47,13 b' test with recursive collection' | |||||
47 | adding manifests |
|
47 | adding manifests | |
48 | adding file changes |
|
48 | adding file changes | |
49 | added 2 changesets with 2 changes to 2 files |
|
49 | added 2 changesets with 2 changes to 2 files | |
|
50 | new changesets cb9a9f314b8b:184916345baa | |||
50 | requesting all changes |
|
51 | requesting all changes | |
51 | adding changesets |
|
52 | adding changesets | |
52 | adding manifests |
|
53 | adding manifests | |
53 | adding file changes |
|
54 | adding file changes | |
54 | added 1 changesets with 3 changes to 3 files |
|
55 | added 1 changesets with 3 changes to 3 files | |
|
56 | new changesets 4052ceaa8c4e | |||
55 | updating to branch default |
|
57 | updating to branch default | |
56 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
57 | 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 | |
@@ -86,11 +88,13 b' test with normal collection' | |||||
86 | adding manifests |
|
88 | adding manifests | |
87 | adding file changes |
|
89 | adding file changes | |
88 | added 2 changesets with 2 changes to 2 files |
|
90 | added 2 changesets with 2 changes to 2 files | |
|
91 | new changesets cb9a9f314b8b:184916345baa | |||
89 | requesting all changes |
|
92 | requesting all changes | |
90 | adding changesets |
|
93 | adding changesets | |
91 | adding manifests |
|
94 | adding manifests | |
92 | adding file changes |
|
95 | adding file changes | |
93 | added 1 changesets with 3 changes to 3 files |
|
96 | added 1 changesets with 3 changes to 3 files | |
|
97 | new changesets 4052ceaa8c4e | |||
94 | updating to branch default |
|
98 | updating to branch default | |
95 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
99 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
96 | 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 | |
@@ -125,11 +129,13 b' test with old-style collection' | |||||
125 | adding manifests |
|
129 | adding manifests | |
126 | adding file changes |
|
130 | adding file changes | |
127 | added 2 changesets with 2 changes to 2 files |
|
131 | added 2 changesets with 2 changes to 2 files | |
|
132 | new changesets cb9a9f314b8b:184916345baa | |||
128 | requesting all changes |
|
133 | requesting all changes | |
129 | adding changesets |
|
134 | adding changesets | |
130 | adding manifests |
|
135 | adding manifests | |
131 | adding file changes |
|
136 | adding file changes | |
132 | added 1 changesets with 3 changes to 3 files |
|
137 | added 1 changesets with 3 changes to 3 files | |
|
138 | new changesets 4052ceaa8c4e | |||
133 | updating to branch default |
|
139 | updating to branch default | |
134 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
135 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
141 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -166,6 +166,7 b' Testing applied patches, push and --forc' | |||||
166 | adding manifests |
|
166 | adding manifests | |
167 | adding file changes |
|
167 | adding file changes | |
168 | added 1 changesets with 1 changes to 1 files |
|
168 | added 1 changesets with 1 changes to 1 files | |
|
169 | new changesets 07f494440405 | |||
169 | updating to branch default |
|
170 | updating to branch default | |
170 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
171 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
171 | $ echo a >> a |
|
172 | $ echo a >> a |
@@ -782,6 +782,7 b' strip' | |||||
782 | adding manifests |
|
782 | adding manifests | |
783 | adding file changes |
|
783 | adding file changes | |
784 | added 1 changesets with 1 changes to 1 files |
|
784 | added 1 changesets with 1 changes to 1 files | |
|
785 | new changesets 770eb8fce608 | |||
785 | (run 'hg update' to get a working copy) |
|
786 | (run 'hg update' to get a working copy) | |
786 |
|
787 | |||
787 |
|
788 |
@@ -85,6 +85,7 b' unbundle with unrelated source' | |||||
85 | adding manifests |
|
85 | adding manifests | |
86 | adding file changes |
|
86 | adding file changes | |
87 | added 2 changesets with 2 changes to 1 files |
|
87 | added 2 changesets with 2 changes to 1 files | |
|
88 | new changesets cb9a9f314b8b:ba677d0156c1 | |||
88 | (run 'hg update' to get a working copy) |
|
89 | (run 'hg update' to get a working copy) | |
89 | $ hg --cwd a rollback |
|
90 | $ hg --cwd a rollback | |
90 | repository tip rolled back to revision -1 (undo unbundle) |
|
91 | repository tip rolled back to revision -1 (undo unbundle) | |
@@ -97,6 +98,7 b' unbundle with correct source' | |||||
97 | adding manifests |
|
98 | adding manifests | |
98 | adding file changes |
|
99 | adding file changes | |
99 | added 2 changesets with 2 changes to 1 files |
|
100 | added 2 changesets with 2 changes to 1 files | |
|
101 | new changesets cb9a9f314b8b:ba677d0156c1 | |||
100 | MIME-Version: 1.0 |
|
102 | MIME-Version: 1.0 | |
101 |
Content-Type: text/plain; |
|
103 | Content-Type: text/plain; charset="us-ascii" | |
102 | Content-Transfer-Encoding: 7bit |
|
104 | Content-Transfer-Encoding: 7bit |
@@ -188,6 +188,7 b' pull (minimal config)' | |||||
188 | adding manifests |
|
188 | adding manifests | |
189 | adding file changes |
|
189 | adding file changes | |
190 | added 1 changesets with 1 changes to 1 files |
|
190 | added 1 changesets with 1 changes to 1 files | |
|
191 | new changesets 0647d048b600 | |||
191 | MIME-Version: 1.0 |
|
192 | MIME-Version: 1.0 | |
192 | Content-Type: text/plain; charset="us-ascii" |
|
193 | Content-Type: text/plain; charset="us-ascii" | |
193 | Content-Transfer-Encoding: 7bit |
|
194 | Content-Transfer-Encoding: 7bit | |
@@ -241,6 +242,7 b' pull' | |||||
241 | adding manifests |
|
242 | adding manifests | |
242 | adding file changes |
|
243 | adding file changes | |
243 | added 1 changesets with 1 changes to 1 files |
|
244 | added 1 changesets with 1 changes to 1 files | |
|
245 | new changesets 0647d048b600 | |||
244 | MIME-Version: 1.0 |
|
246 | MIME-Version: 1.0 | |
245 | Content-Type: text/plain; charset="us-ascii" |
|
247 | Content-Type: text/plain; charset="us-ascii" | |
246 | Content-Transfer-Encoding: 7bit |
|
248 | Content-Transfer-Encoding: 7bit | |
@@ -283,6 +285,7 b' pull' | |||||
283 | adding manifests |
|
285 | adding manifests | |
284 | adding file changes |
|
286 | adding file changes | |
285 | added 1 changesets with 1 changes to 1 files |
|
287 | added 1 changesets with 1 changes to 1 files | |
|
288 | new changesets 0647d048b600 | |||
286 | MIME-Version: 1.0 |
|
289 | MIME-Version: 1.0 | |
287 | Content-Type: text/plain; charset="us-ascii" |
|
290 | Content-Type: text/plain; charset="us-ascii" | |
288 | Content-Transfer-Encoding: 7bit |
|
291 | Content-Transfer-Encoding: 7bit | |
@@ -328,6 +331,7 b' test merge' | |||||
328 | adding manifests |
|
331 | adding manifests | |
329 | adding file changes |
|
332 | adding file changes | |
330 | added 2 changesets with 0 changes to 0 files |
|
333 | added 2 changesets with 0 changes to 0 files | |
|
334 | new changesets 0a184ce6067f:6a0cf76b2701 | |||
331 | MIME-Version: 1.0 |
|
335 | MIME-Version: 1.0 | |
332 | Content-Type: text/plain; charset="us-ascii" |
|
336 | Content-Type: text/plain; charset="us-ascii" | |
333 | Content-Transfer-Encoding: 7bit |
|
337 | Content-Transfer-Encoding: 7bit | |
@@ -383,6 +387,7 b' non-ascii content and truncation of mult' | |||||
383 | adding manifests |
|
387 | adding manifests | |
384 | adding file changes |
|
388 | adding file changes | |
385 | added 1 changesets with 1 changes to 1 files |
|
389 | added 1 changesets with 1 changes to 1 files | |
|
390 | new changesets 7ea05ad269dc | |||
386 | MIME-Version: 1.0 |
|
391 | MIME-Version: 1.0 | |
387 | Content-Type: text/plain; charset="us-ascii" |
|
392 | Content-Type: text/plain; charset="us-ascii" | |
388 | Content-Transfer-Encoding: 8bit |
|
393 | Content-Transfer-Encoding: 8bit | |
@@ -425,6 +430,7 b' long lines' | |||||
425 | adding manifests |
|
430 | adding manifests | |
426 | adding file changes |
|
431 | adding file changes | |
427 | added 1 changesets with 1 changes to 1 files |
|
432 | added 1 changesets with 1 changes to 1 files | |
|
433 | new changesets a323cae54f6e | |||
428 | notify: sending 2 subscribers 1 changes |
|
434 | notify: sending 2 subscribers 1 changes | |
429 | (run 'hg update' to get a working copy) |
|
435 | (run 'hg update' to get a working copy) | |
430 | $ $PYTHON $TESTTMP/filter.py < b/mbox |
|
436 | $ $PYTHON $TESTTMP/filter.py < b/mbox | |
@@ -494,6 +500,7 b' long lines' | |||||
494 | adding manifests |
|
500 | adding manifests | |
495 | adding file changes |
|
501 | adding file changes | |
496 | added 1 changesets with 1 changes to 1 files |
|
502 | added 1 changesets with 1 changes to 1 files | |
|
503 | new changesets b7cf10b2bdec | |||
497 | MIME-Version: 1.0 |
|
504 | MIME-Version: 1.0 | |
498 | Content-Type: text/plain; charset="us-ascii" |
|
505 | Content-Type: text/plain; charset="us-ascii" | |
499 | Content-Transfer-Encoding: 7bit |
|
506 | Content-Transfer-Encoding: 7bit | |
@@ -523,6 +530,7 b' from different branch' | |||||
523 | adding manifests |
|
530 | adding manifests | |
524 | adding file changes |
|
531 | adding file changes | |
525 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
532 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
533 | new changesets 5a07df312a79 | |||
526 | MIME-Version: 1.0 |
|
534 | MIME-Version: 1.0 | |
527 | Content-Type: text/plain; charset="us-ascii" |
|
535 | Content-Type: text/plain; charset="us-ascii" | |
528 | Content-Transfer-Encoding: 7bit |
|
536 | Content-Transfer-Encoding: 7bit |
@@ -1010,6 +1010,7 b' Test setup' | |||||
1010 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
1010 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
1011 | 2 new obsolescence markers |
|
1011 | 2 new obsolescence markers | |
1012 | obsoleted 1 changesets |
|
1012 | obsoleted 1 changesets | |
|
1013 | new changesets 7a230b46bf61 | |||
1013 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1014 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1014 | $ hg log --hidden -G |
|
1015 | $ hg log --hidden -G | |
1015 | o changeset: 2:7a230b46bf61 |
|
1016 | o changeset: 2:7a230b46bf61 |
@@ -207,6 +207,7 b' Actual testing' | |||||
207 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
207 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
208 | # unbundling: 2 new obsolescence markers |
|
208 | # unbundling: 2 new obsolescence markers | |
209 | # unbundling: obsoleted 1 changesets |
|
209 | # unbundling: obsoleted 1 changesets | |
|
210 | # unbundling: new changesets cf2c22470d67 | |||
210 | # unbundling: (run 'hg heads' to see heads) |
|
211 | # unbundling: (run 'hg heads' to see heads) | |
211 |
|
212 | |||
212 | $ testrevs 'desc("C-A")' |
|
213 | $ testrevs 'desc("C-A")' | |
@@ -246,6 +247,7 b' Actual testing' | |||||
246 | # unbundling: adding file changes |
|
247 | # unbundling: adding file changes | |
247 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
248 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
248 | # unbundling: 3 new obsolescence markers |
|
249 | # unbundling: 3 new obsolescence markers | |
|
250 | # unbundling: new changesets cf2c22470d67 | |||
249 | # unbundling: (run 'hg heads' to see heads) |
|
251 | # unbundling: (run 'hg heads' to see heads) | |
250 |
|
252 | |||
251 | chain with prune children |
|
253 | chain with prune children | |
@@ -371,6 +373,7 b' problematic)' | |||||
371 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
373 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
372 | # unbundling: 1 new obsolescence markers |
|
374 | # unbundling: 1 new obsolescence markers | |
373 | # unbundling: obsoleted 1 changesets |
|
375 | # unbundling: obsoleted 1 changesets | |
|
376 | # unbundling: new changesets cf2c22470d67 | |||
374 | # unbundling: (run 'hg heads' to see heads) |
|
377 | # unbundling: (run 'hg heads' to see heads) | |
375 |
|
378 | |||
376 | bundling multiple revisions |
|
379 | bundling multiple revisions | |
@@ -432,6 +435,7 b' bundling multiple revisions' | |||||
432 | # unbundling: adding file changes |
|
435 | # unbundling: adding file changes | |
433 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) |
|
436 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) | |
434 | # unbundling: 3 new obsolescence markers |
|
437 | # unbundling: 3 new obsolescence markers | |
|
438 | # unbundling: new changesets cf2c22470d67 | |||
435 | # unbundling: (run 'hg heads' to see heads) |
|
439 | # unbundling: (run 'hg heads' to see heads) | |
436 |
|
440 | |||
437 | chain with precursors also pruned |
|
441 | chain with precursors also pruned | |
@@ -532,6 +536,7 b' Actual testing' | |||||
532 | # unbundling: adding file changes |
|
536 | # unbundling: adding file changes | |
533 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
537 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
534 | # unbundling: 1 new obsolescence markers |
|
538 | # unbundling: 1 new obsolescence markers | |
|
539 | # unbundling: new changesets cf2c22470d67 | |||
535 | # unbundling: (run 'hg heads' to see heads) |
|
540 | # unbundling: (run 'hg heads' to see heads) | |
536 |
|
541 | |||
537 | $ testrevs 'desc("C-A")' |
|
542 | $ testrevs 'desc("C-A")' | |
@@ -571,6 +576,7 b' Actual testing' | |||||
571 | # unbundling: adding file changes |
|
576 | # unbundling: adding file changes | |
572 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
577 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
573 | # unbundling: 3 new obsolescence markers |
|
578 | # unbundling: 3 new obsolescence markers | |
|
579 | # unbundling: new changesets cf2c22470d67 | |||
574 | # unbundling: (run 'hg heads' to see heads) |
|
580 | # unbundling: (run 'hg heads' to see heads) | |
575 |
|
581 | |||
576 | chain with missing prune |
|
582 | chain with missing prune | |
@@ -653,6 +659,7 b' Actual testing' | |||||
653 | # unbundling: adding file changes |
|
659 | # unbundling: adding file changes | |
654 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
660 | # unbundling: added 1 changesets with 1 changes to 1 files | |
655 | # unbundling: 3 new obsolescence markers |
|
661 | # unbundling: 3 new obsolescence markers | |
|
662 | # unbundling: new changesets cf2c22470d67 | |||
656 | # unbundling: (run 'hg update' to get a working copy) |
|
663 | # unbundling: (run 'hg update' to get a working copy) | |
657 |
|
664 | |||
658 | chain with precursors also pruned |
|
665 | chain with precursors also pruned | |
@@ -732,6 +739,7 b' Actual testing' | |||||
732 | # unbundling: adding file changes |
|
739 | # unbundling: adding file changes | |
733 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
740 | # unbundling: added 1 changesets with 1 changes to 1 files | |
734 | # unbundling: 3 new obsolescence markers |
|
741 | # unbundling: 3 new obsolescence markers | |
|
742 | # unbundling: new changesets cf2c22470d67 | |||
735 | # unbundling: (run 'hg update' to get a working copy) |
|
743 | # unbundling: (run 'hg update' to get a working copy) | |
736 |
|
744 | |||
737 | Chain with fold and split |
|
745 | Chain with fold and split | |
@@ -971,6 +979,7 b' Actual testing' | |||||
971 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
979 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
972 | # unbundling: 6 new obsolescence markers |
|
980 | # unbundling: 6 new obsolescence markers | |
973 | # unbundling: obsoleted 3 changesets |
|
981 | # unbundling: obsoleted 3 changesets | |
|
982 | # unbundling: new changesets 2f20ff6509f0 | |||
974 | # unbundling: (run 'hg heads' to see heads) |
|
983 | # unbundling: (run 'hg heads' to see heads) | |
975 |
|
984 | |||
976 | Bundle multiple revisions |
|
985 | Bundle multiple revisions | |
@@ -1072,6 +1081,7 b' Bundle multiple revisions' | |||||
1072 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1081 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1073 | # unbundling: 7 new obsolescence markers |
|
1082 | # unbundling: 7 new obsolescence markers | |
1074 | # unbundling: obsoleted 2 changesets |
|
1083 | # unbundling: obsoleted 2 changesets | |
|
1084 | # unbundling: new changesets 2f20ff6509f0 | |||
1075 | # unbundling: (run 'hg heads' to see heads) |
|
1085 | # unbundling: (run 'hg heads' to see heads) | |
1076 |
|
1086 | |||
1077 | * top one and initial precursors |
|
1087 | * top one and initial precursors | |
@@ -1138,6 +1148,7 b' Bundle multiple revisions' | |||||
1138 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1148 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1139 | # unbundling: 6 new obsolescence markers |
|
1149 | # unbundling: 6 new obsolescence markers | |
1140 | # unbundling: obsoleted 3 changesets |
|
1150 | # unbundling: obsoleted 3 changesets | |
|
1151 | # unbundling: new changesets 2f20ff6509f0 | |||
1141 | # unbundling: (run 'hg heads' to see heads) |
|
1152 | # unbundling: (run 'hg heads' to see heads) | |
1142 |
|
1153 | |||
1143 | * top one and one of the split |
|
1154 | * top one and one of the split | |
@@ -1206,6 +1217,7 b' Bundle multiple revisions' | |||||
1206 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1217 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
1207 | # unbundling: 7 new obsolescence markers |
|
1218 | # unbundling: 7 new obsolescence markers | |
1208 | # unbundling: obsoleted 2 changesets |
|
1219 | # unbundling: obsoleted 2 changesets | |
|
1220 | # unbundling: new changesets 2f20ff6509f0 | |||
1209 | # unbundling: (run 'hg heads' to see heads) |
|
1221 | # unbundling: (run 'hg heads' to see heads) | |
1210 |
|
1222 | |||
1211 | * all |
|
1223 | * all | |
@@ -1280,6 +1292,7 b' Bundle multiple revisions' | |||||
1280 | # unbundling: adding file changes |
|
1292 | # unbundling: adding file changes | |
1281 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) |
|
1293 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) | |
1282 | # unbundling: 9 new obsolescence markers |
|
1294 | # unbundling: 9 new obsolescence markers | |
|
1295 | # unbundling: new changesets 2f20ff6509f0 | |||
1283 | # unbundling: (run 'hg heads' to see heads) |
|
1296 | # unbundling: (run 'hg heads' to see heads) | |
1284 |
|
1297 | |||
1285 | changeset pruned on its own |
|
1298 | changeset pruned on its own | |
@@ -1381,4 +1394,5 b' Actual testing' | |||||
1381 | # unbundling: adding file changes |
|
1394 | # unbundling: adding file changes | |
1382 | # unbundling: added 2 changesets with 2 changes to 2 files |
|
1395 | # unbundling: added 2 changesets with 2 changes to 2 files | |
1383 | # unbundling: 1 new obsolescence markers |
|
1396 | # unbundling: 1 new obsolescence markers | |
|
1397 | # unbundling: new changesets 9ac430e15fca | |||
1384 | # unbundling: (run 'hg update' to get a working copy) |
|
1398 | # unbundling: (run 'hg update' to get a working copy) |
@@ -71,6 +71,7 b' marker to obsolete him)' | |||||
71 | adding manifests |
|
71 | adding manifests | |
72 | adding file changes |
|
72 | adding file changes | |
73 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
73 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
|
74 | new changesets f89bcc95eba5 | |||
74 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
75 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
75 |
|
76 | |||
76 | check that bundle is not affected |
|
77 | check that bundle is not affected | |
@@ -123,6 +124,7 b' initial repo with server and client matc' | |||||
123 | adding manifests |
|
124 | adding manifests | |
124 | adding file changes |
|
125 | adding file changes | |
125 | added 3 changesets with 3 changes to 1 files |
|
126 | added 3 changesets with 3 changes to 1 files | |
|
127 | new changesets 96ee1d7354c4:6a29ed9c68de | |||
126 | updating to branch default |
|
128 | updating to branch default | |
127 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
128 |
|
130 | |||
@@ -168,5 +170,6 b' client only pulls down 1 changeset' | |||||
168 | bundle2-input-part: total payload size 24 |
|
170 | bundle2-input-part: total payload size 24 | |
169 | bundle2-input-bundle: 2 parts total |
|
171 | bundle2-input-bundle: 2 parts total | |
170 | checking for updated bookmarks |
|
172 | checking for updated bookmarks | |
|
173 | new changesets bec0734cd68e | |||
171 | updating the branch cache |
|
174 | updating the branch cache | |
172 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
175 | (run 'hg heads' to see heads, 'hg merge' to merge) |
@@ -236,6 +236,7 b' setup' | |||||
236 | adding manifests |
|
236 | adding manifests | |
237 | adding file changes |
|
237 | adding file changes | |
238 | added 1 changesets with 1 changes to 1 files |
|
238 | added 1 changesets with 1 changes to 1 files | |
|
239 | new changesets b4952fcf48cf | |||
239 | updating to branch default |
|
240 | updating to branch default | |
240 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
241 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 | $ cd local |
|
242 | $ cd local |
@@ -151,6 +151,7 b' client side: pull from the server' | |||||
151 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
151 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
152 | 1 new obsolescence markers |
|
152 | 1 new obsolescence markers | |
153 | obsoleted 1 changesets |
|
153 | obsoleted 1 changesets | |
|
154 | new changesets 391a2bf12b1b | |||
154 | (run 'hg heads' to see heads) |
|
155 | (run 'hg heads' to see heads) | |
155 | $ hg log -G |
|
156 | $ hg log -G | |
156 | o 4:391a2bf12b1b c_B1 |
|
157 | o 4:391a2bf12b1b c_B1 | |
@@ -277,6 +278,7 b' Bob pulls from Alice and rewrites them' | |||||
277 | adding manifests |
|
278 | adding manifests | |
278 | adding file changes |
|
279 | adding file changes | |
279 | added 2 changesets with 2 changes to 2 files |
|
280 | added 2 changesets with 2 changes to 2 files | |
|
281 | new changesets d33b0a3a6464:ef908e42ce65 | |||
280 | (run 'hg update' to get a working copy) |
|
282 | (run 'hg update' to get a working copy) | |
281 | $ hg up 'desc("c_A")' |
|
283 | $ hg up 'desc("c_A")' | |
282 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
284 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -323,6 +325,7 b' Celeste pulls from Bob and rewrites them' | |||||
323 | adding file changes |
|
325 | adding file changes | |
324 | added 2 changesets with 2 changes to 2 files |
|
326 | added 2 changesets with 2 changes to 2 files | |
325 | 3 new obsolescence markers |
|
327 | 3 new obsolescence markers | |
|
328 | new changesets 5b5708a437f2:956063ac4557 | |||
326 | (run 'hg update' to get a working copy) |
|
329 | (run 'hg update' to get a working copy) | |
327 | $ hg up 'desc("c_A")' |
|
330 | $ hg up 'desc("c_A")' | |
328 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
331 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -392,6 +395,7 b' from the server (note: could be from Cel' | |||||
392 | added 2 changesets with 0 changes to 2 files (+1 heads) |
|
395 | added 2 changesets with 0 changes to 2 files (+1 heads) | |
393 | 6 new obsolescence markers |
|
396 | 6 new obsolescence markers | |
394 | obsoleted 2 changesets |
|
397 | obsoleted 2 changesets | |
|
398 | new changesets 9866d64649a5:77ae25d99ff0 | |||
395 | (run 'hg heads' to see heads) |
|
399 | (run 'hg heads' to see heads) | |
396 | $ hg debugobsolete |
|
400 | $ hg debugobsolete | |
397 | 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
|
401 | 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
@@ -365,6 +365,7 b' Try to pull markers' | |||||
365 | adding file changes |
|
365 | adding file changes | |
366 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
366 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
367 | 5 new obsolescence markers |
|
367 | 5 new obsolescence markers | |
|
368 | new changesets 1f0dee641bb7:6f9641995072 | |||
368 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
369 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
369 | $ hg debugobsolete |
|
370 | $ hg debugobsolete | |
370 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
371 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
@@ -470,6 +471,7 b' On pull' | |||||
470 | adding file changes |
|
471 | adding file changes | |
471 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
472 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
472 | 5 new obsolescence markers |
|
473 | 5 new obsolescence markers | |
|
474 | new changesets 1f0dee641bb7:6f9641995072 | |||
473 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
475 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
474 | $ hg debugobsolete |
|
476 | $ hg debugobsolete | |
475 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
477 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
@@ -786,6 +788,7 b' check hgweb does not explode' | |||||
786 | adding manifests |
|
788 | adding manifests | |
787 | adding file changes |
|
789 | adding file changes | |
788 | added 62 changesets with 63 changes to 9 files (+60 heads) |
|
790 | added 62 changesets with 63 changes to 9 files (+60 heads) | |
|
791 | new changesets 50c51b361e60:c15e9edfca13 | |||
789 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
792 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
790 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
|
793 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | |
791 | > do |
|
794 | > do | |
@@ -1140,6 +1143,7 b' Test bundle overlay onto hidden revision' | |||||
1140 | adding manifests |
|
1143 | adding manifests | |
1141 | adding file changes |
|
1144 | adding file changes | |
1142 | added 2 changesets with 2 changes to 1 files |
|
1145 | added 2 changesets with 2 changes to 1 files | |
|
1146 | new changesets 4b34ecfb0d56:44526ebb0f98 | |||
1143 | updating to branch default |
|
1147 | updating to branch default | |
1144 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1148 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1145 | $ cd ../other-bundleoverlay |
|
1149 | $ cd ../other-bundleoverlay | |
@@ -1397,6 +1401,7 b' Testing that strip remove markers:' | |||||
1397 | adding file changes |
|
1401 | adding file changes | |
1398 | added 2 changesets with 2 changes to 2 files |
|
1402 | added 2 changesets with 2 changes to 2 files | |
1399 | 1 new obsolescence markers |
|
1403 | 1 new obsolescence markers | |
|
1404 | new changesets e016b03fd86f:b0551702f918 | |||
1400 | (run 'hg update' to get a working copy) |
|
1405 | (run 'hg update' to get a working copy) | |
1401 | $ hg debugobsolete | sort |
|
1406 | $ hg debugobsolete | sort | |
1402 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1407 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
@@ -32,6 +32,7 b' check custom patch options are honored' | |||||
32 | adding manifests |
|
32 | adding manifests | |
33 | adding file changes |
|
33 | adding file changes | |
34 | added 1 changesets with 1 changes to 1 files |
|
34 | added 1 changesets with 1 changes to 1 files | |
|
35 | new changesets 8580ff50825a | |||
35 | updating to branch default |
|
36 | updating to branch default | |
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
37 |
|
38 | |||
@@ -68,6 +69,7 b' Clone and apply patch:' | |||||
68 | adding manifests |
|
69 | adding manifests | |
69 | adding file changes |
|
70 | adding file changes | |
70 | added 1 changesets with 1 changes to 1 files |
|
71 | added 1 changesets with 1 changes to 1 files | |
|
72 | new changesets 7fadb901d403 | |||
71 | updating to branch default |
|
73 | updating to branch default | |
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
74 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
73 | $ cd d |
|
75 | $ cd d |
@@ -3053,6 +3053,7 b' node missing at public' | |||||
3053 | adding manifests |
|
3053 | adding manifests | |
3054 | adding file changes |
|
3054 | adding file changes | |
3055 | added 3 changesets with 3 changes to 3 files |
|
3055 | added 3 changesets with 3 changes to 3 files | |
|
3056 | new changesets 8580ff50825a:2f9fa9b998c5 | |||
3056 | updating to branch test |
|
3057 | updating to branch test | |
3057 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3058 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3058 | $ echo 'publicurl=$TESTTMP/t3' >> $HGRCPATH |
|
3059 | $ echo 'publicurl=$TESTTMP/t3' >> $HGRCPATH |
@@ -80,6 +80,7 b'' | |||||
80 | adding manifests |
|
80 | adding manifests | |
81 | adding file changes |
|
81 | adding file changes | |
82 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
82 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
83 | new changesets 54acac6f23ab:b555f63b6063 | |||
83 | test-debug-phase: new rev 3: x -> 0 |
|
84 | test-debug-phase: new rev 3: x -> 0 | |
84 | test-debug-phase: new rev 4: x -> 0 |
|
85 | test-debug-phase: new rev 4: x -> 0 | |
85 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
86 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
@@ -148,6 +149,7 b' update must update phase of common chang' | |||||
148 | adding manifests |
|
149 | adding manifests | |
149 | adding file changes |
|
150 | adding file changes | |
150 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
151 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
152 | new changesets f54f1bb90ff3 | |||
151 | test-debug-phase: new rev 4: x -> 0 |
|
153 | test-debug-phase: new rev 4: x -> 0 | |
152 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
154 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
153 |
|
155 | |||
@@ -202,6 +204,7 b' changegroup are added without phase move' | |||||
202 | adding manifests |
|
204 | adding manifests | |
203 | adding file changes |
|
205 | adding file changes | |
204 | added 5 changesets with 5 changes to 5 files (+1 heads) |
|
206 | added 5 changesets with 5 changes to 5 files (+1 heads) | |
|
207 | new changesets 054250a37db4:b555f63b6063 | |||
205 | test-debug-phase: new rev 0: x -> 1 |
|
208 | test-debug-phase: new rev 0: x -> 1 | |
206 | test-debug-phase: new rev 1: x -> 1 |
|
209 | test-debug-phase: new rev 1: x -> 1 | |
207 | test-debug-phase: new rev 2: x -> 1 |
|
210 | test-debug-phase: new rev 2: x -> 1 | |
@@ -235,6 +238,7 b' Pulling from publish=False to publish=Fa' | |||||
235 | adding manifests |
|
238 | adding manifests | |
236 | adding file changes |
|
239 | adding file changes | |
237 | added 3 changesets with 3 changes to 3 files |
|
240 | added 3 changesets with 3 changes to 3 files | |
|
241 | new changesets 054250a37db4:54acac6f23ab | |||
238 | test-debug-phase: new rev 0: x -> 1 |
|
242 | test-debug-phase: new rev 0: x -> 1 | |
239 | test-debug-phase: new rev 1: x -> 1 |
|
243 | test-debug-phase: new rev 1: x -> 1 | |
240 | test-debug-phase: new rev 2: x -> 1 |
|
244 | test-debug-phase: new rev 2: x -> 1 | |
@@ -256,6 +260,7 b' Even for common' | |||||
256 | adding manifests |
|
260 | adding manifests | |
257 | adding file changes |
|
261 | adding file changes | |
258 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
262 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
263 | new changesets f54f1bb90ff3 | |||
259 | test-debug-phase: new rev 3: x -> 1 |
|
264 | test-debug-phase: new rev 3: x -> 1 | |
260 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
265 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
261 | $ hgph |
|
266 | $ hgph | |
@@ -279,6 +284,7 b' we are in nu' | |||||
279 | adding manifests |
|
284 | adding manifests | |
280 | adding file changes |
|
285 | adding file changes | |
281 | added 1 changesets with 1 changes to 1 files |
|
286 | added 1 changesets with 1 changes to 1 files | |
|
287 | new changesets b555f63b6063 | |||
282 | test-debug-phase: move rev 0: 1 -> 0 |
|
288 | test-debug-phase: move rev 0: 1 -> 0 | |
283 | test-debug-phase: move rev 1: 1 -> 0 |
|
289 | test-debug-phase: move rev 1: 1 -> 0 | |
284 | test-debug-phase: move rev 2: 1 -> 0 |
|
290 | test-debug-phase: move rev 2: 1 -> 0 | |
@@ -326,6 +332,7 b' pulling from Publish=False to publish=Fa' | |||||
326 | adding manifests |
|
332 | adding manifests | |
327 | adding file changes |
|
333 | adding file changes | |
328 | added 2 changesets with 2 changes to 2 files |
|
334 | added 2 changesets with 2 changes to 2 files | |
|
335 | new changesets d6bcb4f74035:145e75495359 | |||
329 | test-debug-phase: move rev 0: 1 -> 0 |
|
336 | test-debug-phase: move rev 0: 1 -> 0 | |
330 | test-debug-phase: move rev 1: 1 -> 0 |
|
337 | test-debug-phase: move rev 1: 1 -> 0 | |
331 | test-debug-phase: move rev 3: 1 -> 0 |
|
338 | test-debug-phase: move rev 3: 1 -> 0 | |
@@ -371,6 +378,7 b' pulling into publish=True' | |||||
371 | adding manifests |
|
378 | adding manifests | |
372 | adding file changes |
|
379 | adding file changes | |
373 | added 2 changesets with 2 changes to 2 files |
|
380 | added 2 changesets with 2 changes to 2 files | |
|
381 | new changesets d6bcb4f74035:145e75495359 | |||
374 | test-debug-phase: new rev 5: x -> 1 |
|
382 | test-debug-phase: new rev 5: x -> 1 | |
375 | test-debug-phase: new rev 6: x -> 1 |
|
383 | test-debug-phase: new rev 6: x -> 1 | |
376 | (run 'hg update' to get a working copy) |
|
384 | (run 'hg update' to get a working copy) | |
@@ -930,6 +938,7 b' Discovery locally secret changeset on a ' | |||||
930 | adding manifests |
|
938 | adding manifests | |
931 | adding file changes |
|
939 | adding file changes | |
932 | added 1 changesets with 1 changes to 1 files |
|
940 | added 1 changesets with 1 changes to 1 files | |
|
941 | new changesets 435b5d83910c | |||
933 | test-debug-phase: new rev 10: x -> 1 |
|
942 | test-debug-phase: new rev 10: x -> 1 | |
934 | (run 'hg update' to get a working copy) |
|
943 | (run 'hg update' to get a working copy) | |
935 | $ hgph -R ../mu |
|
944 | $ hgph -R ../mu | |
@@ -1059,6 +1068,7 b' pull new changeset with common draft loc' | |||||
1059 | adding manifests |
|
1068 | adding manifests | |
1060 | adding file changes |
|
1069 | adding file changes | |
1061 | added 1 changesets with 1 changes to 1 files |
|
1070 | added 1 changesets with 1 changes to 1 files | |
|
1071 | new changesets 5237fb433fc8 | |||
1062 | test-debug-phase: new rev 13: x -> 1 |
|
1072 | test-debug-phase: new rev 13: x -> 1 | |
1063 | (run 'hg update' to get a working copy) |
|
1073 | (run 'hg update' to get a working copy) | |
1064 | $ hgph |
|
1074 | $ hgph | |
@@ -1120,6 +1130,7 b' Test that test are properly ignored on r' | |||||
1120 | adding manifests |
|
1130 | adding manifests | |
1121 | adding file changes |
|
1131 | adding file changes | |
1122 | added 2 changesets with 2 changes to 2 files |
|
1132 | added 2 changesets with 2 changes to 2 files | |
|
1133 | new changesets e9f537e46dea:b740e3e5c05d | |||
1123 | test-debug-phase: new rev 5: x -> 0 |
|
1134 | test-debug-phase: new rev 5: x -> 0 | |
1124 | test-debug-phase: new rev 6: x -> 0 |
|
1135 | test-debug-phase: new rev 6: x -> 0 | |
1125 | (run 'hg update' to get a working copy) |
|
1136 | (run 'hg update' to get a working copy) |
@@ -247,6 +247,7 b' Test secret changeset are not pull' | |||||
247 | adding manifests |
|
247 | adding manifests | |
248 | adding file changes |
|
248 | adding file changes | |
249 | added 5 changesets with 5 changes to 5 files (+1 heads) |
|
249 | added 5 changesets with 5 changes to 5 files (+1 heads) | |
|
250 | new changesets 4a2df7238c3b:cf9fe039dfd6 | |||
250 | test-debug-phase: new rev 0: x -> 0 |
|
251 | test-debug-phase: new rev 0: x -> 0 | |
251 | test-debug-phase: new rev 1: x -> 0 |
|
252 | test-debug-phase: new rev 1: x -> 0 | |
252 | test-debug-phase: new rev 2: x -> 0 |
|
253 | test-debug-phase: new rev 2: x -> 0 | |
@@ -602,6 +603,7 b' test hidden changeset are not cloned as ' | |||||
602 | adding manifests |
|
603 | adding manifests | |
603 | adding file changes |
|
604 | adding file changes | |
604 | added 7 changesets with 6 changes to 6 files |
|
605 | added 7 changesets with 6 changes to 6 files | |
|
606 | new changesets 4a2df7238c3b:17a481b3bccb | |||
605 | test-debug-phase: new rev 0: x -> 0 |
|
607 | test-debug-phase: new rev 0: x -> 0 | |
606 | test-debug-phase: new rev 1: x -> 0 |
|
608 | test-debug-phase: new rev 1: x -> 0 | |
607 | test-debug-phase: new rev 2: x -> 0 |
|
609 | test-debug-phase: new rev 2: x -> 0 |
@@ -19,6 +19,7 b'' | |||||
19 | adding manifests |
|
19 | adding manifests | |
20 | adding file changes |
|
20 | adding file changes | |
21 | added 2 changesets with 2 changes to 1 files |
|
21 | added 2 changesets with 2 changes to 1 files | |
|
22 | new changesets 495a0ec48aaf:50e089d141b7 | |||
22 | (run 'hg update' to get a working copy) |
|
23 | (run 'hg update' to get a working copy) | |
23 | $ hg up branchA |
|
24 | $ hg up branchA | |
24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -47,6 +48,7 b' A new branch is there' | |||||
47 | adding manifests |
|
48 | adding manifests | |
48 | adding file changes |
|
49 | adding file changes | |
49 | added 2 changesets with 2 changes to 1 files (+1 heads) |
|
50 | added 2 changesets with 2 changes to 1 files (+1 heads) | |
|
51 | new changesets 9f878dea0b96:5be59ce5067b | |||
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 |
|
53 | |||
52 | Develop both branches: |
|
54 | Develop both branches: | |
@@ -72,6 +74,7 b' Should succeed, no new heads:' | |||||
72 | adding manifests |
|
74 | adding manifests | |
73 | adding file changes |
|
75 | adding file changes | |
74 | added 2 changesets with 2 changes to 1 files |
|
76 | added 2 changesets with 2 changes to 1 files | |
|
77 | new changesets 7c8fe7e20c32:453e93fa00a5 | |||
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
78 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 |
|
79 | |||
77 | Add a head on other branch: |
|
80 | Add a head on other branch: | |
@@ -102,6 +105,7 b' Should succeed because there is only one' | |||||
102 | adding manifests |
|
105 | adding manifests | |
103 | adding file changes |
|
106 | adding file changes | |
104 | added 3 changesets with 3 changes to 1 files (+1 heads) |
|
107 | added 3 changesets with 3 changes to 1 files (+1 heads) | |
|
108 | new changesets da3a8a0161c6:b61cab8fe4e8 | |||
105 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
106 |
|
110 | |||
107 | $ cd ../t |
|
111 | $ cd ../t | |
@@ -132,6 +136,7 b' Should succeed because there is only one' | |||||
132 | adding manifests |
|
136 | adding manifests | |
133 | adding file changes |
|
137 | adding file changes | |
134 | added 4 changesets with 4 changes to 1 files (+1 heads) |
|
138 | added 4 changesets with 4 changes to 1 files (+1 heads) | |
|
139 | new changesets 0c4d148ae29e:ecfc3f4a6fd9 | |||
135 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
136 | updated to "d740e1a584e7: a5.2" |
|
141 | updated to "d740e1a584e7: a5.2" | |
137 | 1 other heads for branch "branchA" |
|
142 | 1 other heads for branch "branchA" | |
@@ -164,6 +169,7 b' Pull branchC from tt' | |||||
164 | adding manifests |
|
169 | adding manifests | |
165 | adding file changes |
|
170 | adding file changes | |
166 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
171 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
172 | new changesets 7d8ffa4c0b22 | |||
167 | (run 'hg heads' to see heads) |
|
173 | (run 'hg heads' to see heads) | |
168 |
|
174 | |||
169 | Make changes on default and branchC on tt |
|
175 | Make changes on default and branchC on tt | |
@@ -176,6 +182,7 b' Make changes on default and branchC on t' | |||||
176 | adding manifests |
|
182 | adding manifests | |
177 | adding file changes |
|
183 | adding file changes | |
178 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
184 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
185 | new changesets 2b94b54b6b5f | |||
179 | (run 'hg heads' to see heads) |
|
186 | (run 'hg heads' to see heads) | |
180 | $ hg up -C default |
|
187 | $ hg up -C default | |
181 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -211,6 +218,7 b' Pull from tt' | |||||
211 | adding manifests |
|
218 | adding manifests | |
212 | adding file changes |
|
219 | adding file changes | |
213 | added 2 changesets with 2 changes to 2 files (+2 heads) |
|
220 | added 2 changesets with 2 changes to 2 files (+2 heads) | |
|
221 | new changesets eed40c14b407:e634733b0309 | |||
214 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
222 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
215 |
|
223 | |||
216 | $ cd .. |
|
224 | $ cd .. |
@@ -23,6 +23,7 b' Cloning with a password in the URL shoul' | |||||
23 | adding manifests |
|
23 | adding manifests | |
24 | adding file changes |
|
24 | adding file changes | |
25 | added 2 changesets with 2 changes to 1 files |
|
25 | added 2 changesets with 2 changes to 1 files | |
|
26 | new changesets cb9a9f314b8b:ba677d0156c1 | |||
26 | updating to branch default |
|
27 | updating to branch default | |
27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 | $ cat test3/.hg/hgrc |
|
29 | $ cat test3/.hg/hgrc |
@@ -16,6 +16,7 b'' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 1 changesets with 1 changes to 1 files |
|
18 | added 1 changesets with 1 changes to 1 files | |
|
19 | new changesets 97310831fa1a | |||
19 | updating to branch default |
|
20 | updating to branch default | |
20 | 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 | |
21 |
|
22 |
@@ -18,6 +18,7 b' create one repo with a shorter history' | |||||
18 | adding manifests |
|
18 | adding manifests | |
19 | adding file changes |
|
19 | adding file changes | |
20 | added 1 changesets with 1 changes to 1 files |
|
20 | added 1 changesets with 1 changes to 1 files | |
|
21 | new changesets 495a0ec48aaf | |||
21 | updating to branch default |
|
22 | updating to branch default | |
22 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 | $ cd source2 |
|
24 | $ cd source2 | |
@@ -49,6 +50,7 b' start a pull...' | |||||
49 | adding manifests |
|
50 | adding manifests | |
50 | adding file changes |
|
51 | adding file changes | |
51 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
52 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
53 | new changesets ca3c05af513e | |||
52 |
|
|
54 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
53 | $ cat pull.out |
|
55 | $ cat pull.out | |
54 | pulling from ../source1 |
|
56 | pulling from ../source1 | |
@@ -57,6 +59,7 b' start a pull...' | |||||
57 | adding manifests |
|
59 | adding manifests | |
58 | adding file changes |
|
60 | adding file changes | |
59 | added 10 changesets with 10 changes to 1 files |
|
61 | added 10 changesets with 10 changes to 1 files | |
|
62 | new changesets 495a0ec48aaf:1e7b6c812ca8 | |||
60 | (run 'hg update' to get a working copy) |
|
63 | (run 'hg update' to get a working copy) | |
61 |
|
64 | |||
62 | see the result |
|
65 | see the result |
@@ -49,6 +49,7 b' don\'t show "(+1 heads)" message when pul' | |||||
49 | adding manifests |
|
49 | adding manifests | |
50 | adding file changes |
|
50 | adding file changes | |
51 | added 2 changesets with 1 changes to 1 files |
|
51 | added 2 changesets with 1 changes to 1 files | |
|
52 | new changesets 8c900227dd5d:00cfe9073916 | |||
52 | (run 'hg update' to get a working copy) |
|
53 | (run 'hg update' to get a working copy) | |
53 | $ hg heads -q --closed |
|
54 | $ hg heads -q --closed | |
54 | 4:00cfe9073916 |
|
55 | 4:00cfe9073916 | |
@@ -121,6 +122,7 b' We use http because http is better is ou' | |||||
121 | adding manifests |
|
122 | adding manifests | |
122 | adding file changes |
|
123 | adding file changes | |
123 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
124 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
125 | new changesets effea6de0384 | |||
124 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
125 | $ hg log -G |
|
127 | $ hg log -G | |
126 | @ changeset: 2:effea6de0384 |
|
128 | @ changeset: 2:effea6de0384 |
@@ -26,6 +26,7 b' Should respect config to disable dirty u' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
28 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
29 | new changesets 107cefe13e42 | |||
29 | abort: uncommitted changes |
|
30 | abort: uncommitted changes | |
30 | [255] |
|
31 | [255] | |
31 | $ hg --config extensions.strip= strip --no-backup tip |
|
32 | $ hg --config extensions.strip= strip --no-backup tip | |
@@ -40,6 +41,7 b' Should not update to the other topologic' | |||||
40 | adding manifests |
|
41 | adding manifests | |
41 | adding file changes |
|
42 | adding file changes | |
42 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
43 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
44 | new changesets 107cefe13e42 | |||
43 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
44 | updated to "800c91d5bfc1: m" |
|
46 | updated to "800c91d5bfc1: m" | |
45 | 1 other heads for branch "default" |
|
47 | 1 other heads for branch "default" | |
@@ -55,6 +57,7 b' Should not update to the other branch:' | |||||
55 | adding manifests |
|
57 | adding manifests | |
56 | adding file changes |
|
58 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
59 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
60 | new changesets 800c91d5bfc1 | |||
58 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
59 | updated to "107cefe13e42: m" |
|
62 | updated to "107cefe13e42: m" | |
60 | 1 other heads for branch "default" |
|
63 | 1 other heads for branch "default" | |
@@ -76,6 +79,7 b' Should work:' | |||||
76 | adding manifests |
|
79 | adding manifests | |
77 | adding file changes |
|
80 | adding file changes | |
78 | added 1 changesets with 1 changes to 1 files (-1 heads) |
|
81 | added 1 changesets with 1 changes to 1 files (-1 heads) | |
|
82 | new changesets 483b76ad4309 | |||
79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 |
|
84 | |||
81 | Similarity between "hg update" and "hg pull -u" in handling bookmark |
|
85 | Similarity between "hg update" and "hg pull -u" in handling bookmark | |
@@ -103,6 +107,7 b' explicit destination of the update.' | |||||
103 | adding file changes |
|
107 | adding file changes | |
104 | added 1 changesets with 1 changes to 1 files |
|
108 | added 1 changesets with 1 changes to 1 files | |
105 | adding remote bookmark active-after-pull |
|
109 | adding remote bookmark active-after-pull | |
|
110 | new changesets f815b3da6163 | |||
106 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | (activating bookmark active-after-pull) |
|
112 | (activating bookmark active-after-pull) | |
108 |
|
113 | |||
@@ -131,6 +136,7 b' explicit destination of the update.' | |||||
131 | adding file changes |
|
136 | adding file changes | |
132 | added 1 changesets with 1 changes to 1 files |
|
137 | added 1 changesets with 1 changes to 1 files | |
133 | adding remote bookmark active-after-pull |
|
138 | adding remote bookmark active-after-pull | |
|
139 | new changesets f815b3da6163 | |||
134 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
140 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
135 | (activating bookmark active-after-pull) |
|
141 | (activating bookmark active-after-pull) | |
136 |
|
142 | |||
@@ -168,6 +174,7 b' match with the name of any existing book' | |||||
168 | adding manifests |
|
174 | adding manifests | |
169 | adding file changes |
|
175 | adding file changes | |
170 | added 2 changesets with 1 changes to 1 files |
|
176 | added 2 changesets with 1 changes to 1 files | |
|
177 | new changesets f815b3da6163:b5e4babfaaa7 | |||
171 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
178 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
172 | (leaving bookmark active-before-pull) |
|
179 | (leaving bookmark active-before-pull) | |
173 |
|
180 | |||
@@ -194,6 +201,7 b' match with the name of any existing book' | |||||
194 | adding manifests |
|
201 | adding manifests | |
195 | adding file changes |
|
202 | adding file changes | |
196 | added 2 changesets with 1 changes to 1 files |
|
203 | added 2 changesets with 1 changes to 1 files | |
|
204 | new changesets f815b3da6163:b5e4babfaaa7 | |||
197 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
198 | (leaving bookmark active-before-pull) |
|
206 | (leaving bookmark active-before-pull) | |
199 |
|
207 | |||
@@ -220,6 +228,7 b' match with the name of any existing book' | |||||
220 | adding manifests |
|
228 | adding manifests | |
221 | adding file changes |
|
229 | adding file changes | |
222 | added 2 changesets with 1 changes to 1 files |
|
230 | added 2 changesets with 1 changes to 1 files | |
|
231 | new changesets f815b3da6163:b5e4babfaaa7 | |||
223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
232 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
224 | (leaving bookmark active-before-pull) |
|
233 | (leaving bookmark active-before-pull) | |
225 |
|
234 |
@@ -25,6 +25,7 b'' | |||||
25 | adding manifests |
|
25 | adding manifests | |
26 | adding file changes |
|
26 | adding file changes | |
27 | added 1 changesets with 1 changes to 1 files |
|
27 | added 1 changesets with 1 changes to 1 files | |
|
28 | new changesets 340e38bdcde4 | |||
28 | updating to branch default |
|
29 | updating to branch default | |
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 |
|
31 | |||
@@ -76,6 +77,7 b' Issue622: hg init && hg pull -u URL does' | |||||
76 | adding manifests |
|
77 | adding manifests | |
77 | adding file changes |
|
78 | adding file changes | |
78 | added 1 changesets with 1 changes to 1 files |
|
79 | added 1 changesets with 1 changes to 1 files | |
|
80 | new changesets 340e38bdcde4 | |||
79 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 |
|
82 | |||
81 | Test 'file:' uri handling: |
|
83 | Test 'file:' uri handling: |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -53,6 +53,7 b' Test setup' | |||||
53 | adding manifests |
|
53 | adding manifests | |
54 | adding file changes |
|
54 | adding file changes | |
55 | added 1 changesets with 1 changes to 1 files |
|
55 | added 1 changesets with 1 changes to 1 files | |
|
56 | new changesets d73caddc5533 | |||
56 | (run 'hg update' to get a working copy) |
|
57 | (run 'hg update' to get a working copy) | |
57 | $ hg up 0 |
|
58 | $ hg up 0 | |
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -54,6 +54,7 b' Test setup' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 1 changesets with 1 changes to 1 files |
|
56 | added 1 changesets with 1 changes to 1 files | |
|
57 | new changesets d73caddc5533 | |||
57 | (run 'hg update' to get a working copy) |
|
58 | (run 'hg update' to get a working copy) | |
58 | $ hg up 0 |
|
59 | $ hg up 0 | |
59 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -57,6 +57,7 b' Test setup' | |||||
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 2 changesets with 2 changes to 2 files |
|
59 | added 2 changesets with 2 changes to 2 files | |
|
60 | new changesets d73caddc5533:821fb21d0dd2 | |||
60 | (run 'hg update' to get a working copy) |
|
61 | (run 'hg update' to get a working copy) | |
61 | $ hg up 0 |
|
62 | $ hg up 0 | |
62 | 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 |
@@ -55,6 +55,7 b' Test setup' | |||||
55 | adding manifests |
|
55 | adding manifests | |
56 | adding file changes |
|
56 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files |
|
57 | added 1 changesets with 1 changes to 1 files | |
|
58 | new changesets d73caddc5533 | |||
58 | (run 'hg update' to get a working copy) |
|
59 | (run 'hg update' to get a working copy) | |
59 | $ hg up 0 |
|
60 | $ hg up 0 | |
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -52,6 +52,7 b' Test setup' | |||||
52 | adding manifests |
|
52 | adding manifests | |
53 | adding file changes |
|
53 | adding file changes | |
54 | added 1 changesets with 1 changes to 1 files |
|
54 | added 1 changesets with 1 changes to 1 files | |
|
55 | new changesets d73caddc5533 | |||
55 | (run 'hg update' to get a working copy) |
|
56 | (run 'hg update' to get a working copy) | |
56 | $ hg up 0 |
|
57 | $ hg up 0 | |
57 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
58 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -55,6 +55,7 b' Test setup' | |||||
55 | adding manifests |
|
55 | adding manifests | |
56 | adding file changes |
|
56 | adding file changes | |
57 | added 1 changesets with 1 changes to 1 files |
|
57 | added 1 changesets with 1 changes to 1 files | |
|
58 | new changesets d73caddc5533 | |||
58 | (run 'hg update' to get a working copy) |
|
59 | (run 'hg update' to get a working copy) | |
59 | $ hg up 0 |
|
60 | $ hg up 0 | |
60 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -59,6 +59,7 b' Test setup' | |||||
59 | adding manifests |
|
59 | adding manifests | |
60 | adding file changes |
|
60 | adding file changes | |
61 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
61 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
62 | new changesets d73caddc5533:0f88766e02d6 | |||
62 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
63 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
63 | $ hg up 0 |
|
64 | $ hg up 0 | |
64 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
65 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -59,6 +59,7 b' Test setup' | |||||
59 | adding manifests |
|
59 | adding manifests | |
60 | adding file changes |
|
60 | adding file changes | |
61 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
61 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
62 | new changesets d73caddc5533:0f88766e02d6 | |||
62 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
63 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
63 | $ hg up 'desc(C0)' |
|
64 | $ hg up 'desc(C0)' | |
64 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
65 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -57,6 +57,7 b' Test setup' | |||||
57 | adding manifests |
|
57 | adding manifests | |
58 | adding file changes |
|
58 | adding file changes | |
59 | added 1 changesets with 1 changes to 1 files |
|
59 | added 1 changesets with 1 changes to 1 files | |
|
60 | new changesets d73caddc5533 | |||
60 | (run 'hg update' to get a working copy) |
|
61 | (run 'hg update' to get a working copy) | |
61 | $ hg up 0 |
|
62 | $ hg up 0 | |
62 | 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 |
@@ -56,6 +56,7 b' Test setup' | |||||
56 | adding manifests |
|
56 | adding manifests | |
57 | adding file changes |
|
57 | adding file changes | |
58 | added 1 changesets with 1 changes to 1 files |
|
58 | added 1 changesets with 1 changes to 1 files | |
|
59 | new changesets d73caddc5533 | |||
59 | (run 'hg update' to get a working copy) |
|
60 | (run 'hg update' to get a working copy) | |
60 | $ hg up 0 |
|
61 | $ hg up 0 | |
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
62 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -73,6 +73,7 b' Test setup' | |||||
73 | adding manifests |
|
73 | adding manifests | |
74 | adding file changes |
|
74 | adding file changes | |
75 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
75 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
76 | new changesets d73caddc5533:0f88766e02d6 | |||
76 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
77 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
77 | $ hg up 0 |
|
78 | $ hg up 0 | |
78 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
79 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -62,6 +62,7 b' Test setup' | |||||
62 | adding manifests |
|
62 | adding manifests | |
63 | adding file changes |
|
63 | adding file changes | |
64 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
64 | added 2 changesets with 2 changes to 2 files (+1 heads) | |
|
65 | new changesets d73caddc5533:0f88766e02d6 | |||
65 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
66 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
66 | $ hg up 'desc(C0)' |
|
67 | $ hg up 'desc(C0)' | |
67 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
68 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -137,6 +137,7 b' clone it in two clients' | |||||
137 | adding manifests |
|
137 | adding manifests | |
138 | adding file changes |
|
138 | adding file changes | |
139 | added 1 changesets with 1 changes to 1 files |
|
139 | added 1 changesets with 1 changes to 1 files | |
|
140 | new changesets 842e2fac6304 | |||
140 | updating to branch default |
|
141 | updating to branch default | |
141 | 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 | |
142 | $ hg clone ssh://user@dummy/server client-other |
|
143 | $ hg clone ssh://user@dummy/server client-other | |
@@ -145,6 +146,7 b' clone it in two clients' | |||||
145 | adding manifests |
|
146 | adding manifests | |
146 | adding file changes |
|
147 | adding file changes | |
147 | added 1 changesets with 1 changes to 1 files |
|
148 | added 1 changesets with 1 changes to 1 files | |
|
149 | new changesets 842e2fac6304 | |||
148 | updating to branch default |
|
150 | updating to branch default | |
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
151 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 |
|
152 | |||
@@ -229,6 +231,7 b' Both try to replace a different head' | |||||
229 | adding manifests |
|
231 | adding manifests | |
230 | adding file changes |
|
232 | adding file changes | |
231 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
233 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
234 | new changesets a9149a1428e2 | |||
232 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
235 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
233 | $ hg -R ./client-other pull |
|
236 | $ hg -R ./client-other pull | |
234 | pulling from ssh://user@dummy/server |
|
237 | pulling from ssh://user@dummy/server | |
@@ -237,6 +240,7 b' Both try to replace a different head' | |||||
237 | adding manifests |
|
240 | adding manifests | |
238 | adding file changes |
|
241 | adding file changes | |
239 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
242 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
243 | new changesets a9149a1428e2 | |||
240 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
244 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
241 | $ hg -R ./client-racy pull |
|
245 | $ hg -R ./client-racy pull | |
242 | pulling from ssh://user@dummy/server |
|
246 | pulling from ssh://user@dummy/server | |
@@ -245,6 +249,7 b' Both try to replace a different head' | |||||
245 | adding manifests |
|
249 | adding manifests | |
246 | adding file changes |
|
250 | adding file changes | |
247 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
251 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
252 | new changesets 98217d5a1659 | |||
248 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
253 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
249 |
|
254 | |||
250 | $ hg -R server graph |
|
255 | $ hg -R server graph | |
@@ -348,6 +353,7 b' Pushing a new changeset while someone cr' | |||||
348 | adding manifests |
|
353 | adding manifests | |
349 | adding file changes |
|
354 | adding file changes | |
350 | added 1 changesets with 1 changes to 1 files |
|
355 | added 1 changesets with 1 changes to 1 files | |
|
356 | new changesets 59e76faf78bd | |||
351 | (run 'hg update' to get a working copy) |
|
357 | (run 'hg update' to get a working copy) | |
352 |
|
358 | |||
353 | #endif |
|
359 | #endif | |
@@ -367,6 +373,7 b' Pushing a new changeset while someone cr' | |||||
367 | adding manifests |
|
373 | adding manifests | |
368 | adding file changes |
|
374 | adding file changes | |
369 | added 1 changesets with 1 changes to 1 files |
|
375 | added 1 changesets with 1 changes to 1 files | |
|
376 | new changesets 59e76faf78bd | |||
370 | (run 'hg update' to get a working copy) |
|
377 | (run 'hg update' to get a working copy) | |
371 | $ hg -R ./client-racy pull |
|
378 | $ hg -R ./client-racy pull | |
372 | pulling from ssh://user@dummy/server |
|
379 | pulling from ssh://user@dummy/server | |
@@ -375,6 +382,7 b' Pushing a new changeset while someone cr' | |||||
375 | adding manifests |
|
382 | adding manifests | |
376 | adding file changes |
|
383 | adding file changes | |
377 | added 1 changesets with 1 changes to 1 files |
|
384 | added 1 changesets with 1 changes to 1 files | |
|
385 | new changesets 51c544a58128 | |||
378 | (run 'hg update' to get a working copy) |
|
386 | (run 'hg update' to get a working copy) | |
379 |
|
387 | |||
380 | $ hg -R server graph |
|
388 | $ hg -R server graph | |
@@ -503,6 +511,7 b' Pushing two children on the same head, o' | |||||
503 | adding manifests |
|
511 | adding manifests | |
504 | adding file changes |
|
512 | adding file changes | |
505 | added 1 changesets with 1 changes to 1 files |
|
513 | added 1 changesets with 1 changes to 1 files | |
|
514 | new changesets d9e379a8c432 | |||
506 | (run 'hg update' to get a working copy) |
|
515 | (run 'hg update' to get a working copy) | |
507 |
|
516 | |||
508 | #endif |
|
517 | #endif | |
@@ -522,6 +531,7 b' Pushing two children on the same head, o' | |||||
522 | adding manifests |
|
531 | adding manifests | |
523 | adding file changes |
|
532 | adding file changes | |
524 | added 1 changesets with 1 changes to 1 files |
|
533 | added 1 changesets with 1 changes to 1 files | |
|
534 | new changesets d9e379a8c432 | |||
525 | (run 'hg update' to get a working copy) |
|
535 | (run 'hg update' to get a working copy) | |
526 | $ hg -R ./client-racy pull |
|
536 | $ hg -R ./client-racy pull | |
527 | pulling from ssh://user@dummy/server |
|
537 | pulling from ssh://user@dummy/server | |
@@ -530,6 +540,7 b' Pushing two children on the same head, o' | |||||
530 | adding manifests |
|
540 | adding manifests | |
531 | adding file changes |
|
541 | adding file changes | |
532 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
542 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
543 | new changesets d603e2c0cdd7 | |||
533 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
544 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
534 |
|
545 | |||
535 | $ hg -R server graph |
|
546 | $ hg -R server graph | |
@@ -671,6 +682,7 b' Pushing two children on the same head, o' | |||||
671 | adding manifests |
|
682 | adding manifests | |
672 | adding file changes |
|
683 | adding file changes | |
673 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
684 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
685 | new changesets 833be552cfe6 | |||
674 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
686 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
675 |
|
687 | |||
676 | #endif |
|
688 | #endif | |
@@ -690,6 +702,7 b' Pushing two children on the same head, o' | |||||
690 | adding manifests |
|
702 | adding manifests | |
691 | adding file changes |
|
703 | adding file changes | |
692 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
704 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
705 | new changesets 833be552cfe6 | |||
693 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
706 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
694 | $ hg -R ./client-racy pull |
|
707 | $ hg -R ./client-racy pull | |
695 | pulling from ssh://user@dummy/server |
|
708 | pulling from ssh://user@dummy/server | |
@@ -698,6 +711,7 b' Pushing two children on the same head, o' | |||||
698 | adding manifests |
|
711 | adding manifests | |
699 | adding file changes |
|
712 | adding file changes | |
700 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
713 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
714 | new changesets 75d69cba5402 | |||
701 | (run 'hg heads' to see heads) |
|
715 | (run 'hg heads' to see heads) | |
702 |
|
716 | |||
703 | $ hg -R server graph |
|
717 | $ hg -R server graph | |
@@ -853,6 +867,7 b' There are multiple heads, but the racing' | |||||
853 | adding manifests |
|
867 | adding manifests | |
854 | adding file changes |
|
868 | adding file changes | |
855 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
869 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
870 | new changesets 89420bf00fae | |||
856 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
871 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
857 |
|
872 | |||
858 | #endif |
|
873 | #endif | |
@@ -873,6 +888,7 b' There are multiple heads, but the racing' | |||||
873 | adding manifests |
|
888 | adding manifests | |
874 | adding file changes |
|
889 | adding file changes | |
875 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
890 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
891 | new changesets 89420bf00fae | |||
876 | (run 'hg heads' to see heads) |
|
892 | (run 'hg heads' to see heads) | |
877 | $ hg -R ./client-racy pull |
|
893 | $ hg -R ./client-racy pull | |
878 | pulling from ssh://user@dummy/server |
|
894 | pulling from ssh://user@dummy/server | |
@@ -881,6 +897,7 b' There are multiple heads, but the racing' | |||||
881 | adding manifests |
|
897 | adding manifests | |
882 | adding file changes |
|
898 | adding file changes | |
883 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
899 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
900 | new changesets b35ed749f288 | |||
884 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
901 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
885 |
|
902 | |||
886 | $ hg -R server graph |
|
903 | $ hg -R server graph | |
@@ -998,6 +1015,7 b' There are multiple heads, the raced push' | |||||
998 | adding manifests |
|
1015 | adding manifests | |
999 | adding file changes |
|
1016 | adding file changes | |
1000 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1017 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
1018 | new changesets cac2cead0ff0 | |||
1001 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1019 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1002 | $ hg -R ./client-other pull |
|
1020 | $ hg -R ./client-other pull | |
1003 | pulling from ssh://user@dummy/server |
|
1021 | pulling from ssh://user@dummy/server | |
@@ -1006,6 +1024,7 b' There are multiple heads, the raced push' | |||||
1006 | adding manifests |
|
1024 | adding manifests | |
1007 | adding file changes |
|
1025 | adding file changes | |
1008 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1026 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
1027 | new changesets cac2cead0ff0 | |||
1009 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1028 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1010 | $ hg -R ./client-racy pull |
|
1029 | $ hg -R ./client-racy pull | |
1011 | pulling from ssh://user@dummy/server |
|
1030 | pulling from ssh://user@dummy/server | |
@@ -1014,6 +1033,7 b' There are multiple heads, the raced push' | |||||
1014 | adding manifests |
|
1033 | adding manifests | |
1015 | adding file changes |
|
1034 | adding file changes | |
1016 | added 1 changesets with 0 changes to 0 files |
|
1035 | added 1 changesets with 0 changes to 0 files | |
|
1036 | new changesets be705100c623 | |||
1017 | (run 'hg update' to get a working copy) |
|
1037 | (run 'hg update' to get a working copy) | |
1018 |
|
1038 | |||
1019 | $ hg -R server graph |
|
1039 | $ hg -R server graph | |
@@ -1138,6 +1158,7 b' non-continuous branch are valid case, we' | |||||
1138 | adding manifests |
|
1158 | adding manifests | |
1139 | adding file changes |
|
1159 | adding file changes | |
1140 | added 1 changesets with 0 changes to 0 files |
|
1160 | added 1 changesets with 0 changes to 0 files | |
|
1161 | new changesets 866a66e18630 | |||
1141 | (run 'hg update' to get a working copy) |
|
1162 | (run 'hg update' to get a working copy) | |
1142 |
|
1163 | |||
1143 | (creates named branch on head) |
|
1164 | (creates named branch on head) | |
@@ -1159,6 +1180,7 b' non-continuous branch are valid case, we' | |||||
1159 | adding manifests |
|
1180 | adding manifests | |
1160 | adding file changes |
|
1181 | adding file changes | |
1161 | added 2 changesets with 0 changes to 0 files |
|
1182 | added 2 changesets with 0 changes to 0 files | |
|
1183 | new changesets 866a66e18630:55a6f1c01b48 | |||
1162 | (run 'hg update' to get a working copy) |
|
1184 | (run 'hg update' to get a working copy) | |
1163 | $ hg -R ./client-racy pull |
|
1185 | $ hg -R ./client-racy pull | |
1164 | pulling from ssh://user@dummy/server |
|
1186 | pulling from ssh://user@dummy/server | |
@@ -1167,6 +1189,7 b' non-continuous branch are valid case, we' | |||||
1167 | adding manifests |
|
1189 | adding manifests | |
1168 | adding file changes |
|
1190 | adding file changes | |
1169 | added 2 changesets with 1 changes to 1 files (+1 heads) |
|
1191 | added 2 changesets with 1 changes to 1 files (+1 heads) | |
|
1192 | new changesets 6fd3090135df:55a6f1c01b48 | |||
1170 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1193 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1171 |
|
1194 | |||
1172 | $ hg -R server graph |
|
1195 | $ hg -R server graph | |
@@ -1315,6 +1338,7 b' non-continuous branch are valid case, we' | |||||
1315 | adding manifests |
|
1338 | adding manifests | |
1316 | adding file changes |
|
1339 | adding file changes | |
1317 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
1340 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
1341 | new changesets b0ee3d6f51bc | |||
1318 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1342 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1319 | $ hg -R ./client-other pull |
|
1343 | $ hg -R ./client-other pull | |
1320 | pulling from ssh://user@dummy/server |
|
1344 | pulling from ssh://user@dummy/server | |
@@ -1323,6 +1347,7 b' non-continuous branch are valid case, we' | |||||
1323 | adding manifests |
|
1347 | adding manifests | |
1324 | adding file changes |
|
1348 | adding file changes | |
1325 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
1349 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
1350 | new changesets b0ee3d6f51bc | |||
1326 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1351 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1327 | $ hg -R ./client-racy pull |
|
1352 | $ hg -R ./client-racy pull | |
1328 | pulling from ssh://user@dummy/server |
|
1353 | pulling from ssh://user@dummy/server | |
@@ -1331,6 +1356,7 b' non-continuous branch are valid case, we' | |||||
1331 | adding manifests |
|
1356 | adding manifests | |
1332 | adding file changes |
|
1357 | adding file changes | |
1333 | added 2 changesets with 1 changes to 1 files (+1 heads) |
|
1358 | added 2 changesets with 1 changes to 1 files (+1 heads) | |
|
1359 | new changesets d0a85b2252a9:1b58ee3f79e5 | |||
1334 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1360 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1335 |
|
1361 | |||
1336 | $ hg -R server graph |
|
1362 | $ hg -R server graph | |
@@ -1483,6 +1509,7 b' raced commit push a new head obsoleting ' | |||||
1483 | adding manifests |
|
1509 | adding manifests | |
1484 | adding file changes |
|
1510 | adding file changes | |
1485 | added 2 changesets with 2 changes to 1 files (+1 heads) |
|
1511 | added 2 changesets with 2 changes to 1 files (+1 heads) | |
|
1512 | new changesets 2efd43f7b5ba:3d57ed3c1091 | |||
1486 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1513 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1487 | $ hg -R ./client-other pull |
|
1514 | $ hg -R ./client-other pull | |
1488 | pulling from ssh://user@dummy/server |
|
1515 | pulling from ssh://user@dummy/server | |
@@ -1491,6 +1518,7 b' raced commit push a new head obsoleting ' | |||||
1491 | adding manifests |
|
1518 | adding manifests | |
1492 | adding file changes |
|
1519 | adding file changes | |
1493 | added 2 changesets with 2 changes to 1 files (+1 heads) |
|
1520 | added 2 changesets with 2 changes to 1 files (+1 heads) | |
|
1521 | new changesets 2efd43f7b5ba:3d57ed3c1091 | |||
1494 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1522 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1495 | $ hg -R ./client-racy pull |
|
1523 | $ hg -R ./client-racy pull | |
1496 | pulling from ssh://user@dummy/server |
|
1524 | pulling from ssh://user@dummy/server | |
@@ -1499,6 +1527,7 b' raced commit push a new head obsoleting ' | |||||
1499 | adding manifests |
|
1527 | adding manifests | |
1500 | adding file changes |
|
1528 | adding file changes | |
1501 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1529 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
1530 | new changesets de7b9e2ba3f6 | |||
1502 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1531 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1503 |
|
1532 | |||
1504 | $ hg -R server graph |
|
1533 | $ hg -R server graph | |
@@ -1667,6 +1696,7 b' racing commit push a new head obsoleting' | |||||
1667 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1696 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
1668 | 1 new obsolescence markers |
|
1697 | 1 new obsolescence markers | |
1669 | obsoleted 1 changesets |
|
1698 | obsoleted 1 changesets | |
|
1699 | new changesets 720c5163ecf6 | |||
1670 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1700 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1671 | $ hg -R ./client-other pull |
|
1701 | $ hg -R ./client-other pull | |
1672 | pulling from ssh://user@dummy/server |
|
1702 | pulling from ssh://user@dummy/server | |
@@ -1677,6 +1707,7 b' racing commit push a new head obsoleting' | |||||
1677 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1707 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
1678 | 1 new obsolescence markers |
|
1708 | 1 new obsolescence markers | |
1679 | obsoleted 1 changesets |
|
1709 | obsoleted 1 changesets | |
|
1710 | new changesets 720c5163ecf6 | |||
1680 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
1711 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
1681 | $ hg -R ./client-racy pull |
|
1712 | $ hg -R ./client-racy pull | |
1682 | pulling from ssh://user@dummy/server |
|
1713 | pulling from ssh://user@dummy/server | |
@@ -1685,6 +1716,7 b' racing commit push a new head obsoleting' | |||||
1685 | adding manifests |
|
1716 | adding manifests | |
1686 | adding file changes |
|
1717 | adding file changes | |
1687 | added 1 changesets with 0 changes to 0 files |
|
1718 | added 1 changesets with 0 changes to 0 files | |
|
1719 | new changesets a98a47d8b85b | |||
1688 | (run 'hg update' to get a working copy) |
|
1720 | (run 'hg update' to get a working copy) | |
1689 |
|
1721 | |||
1690 | $ hg -R server debugobsolete |
|
1722 | $ hg -R server debugobsolete |
@@ -60,6 +60,7 b' Specifying a revset that evaluates to nu' | |||||
60 | adding manifests |
|
60 | adding manifests | |
61 | adding file changes |
|
61 | adding file changes | |
62 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
62 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
63 | new changesets 1c9246a22a0a | |||
63 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
64 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
64 |
|
65 | |||
65 | $ hg push ../a |
|
66 | $ hg push ../a |
@@ -11,6 +11,7 b" Testing of the '--rev' flag" | |||||
11 | adding manifests |
|
11 | adding manifests | |
12 | adding file changes |
|
12 | adding file changes | |
13 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
13 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
14 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
14 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
15 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
15 |
|
16 | |||
16 | $ for i in 0 1 2 3 4 5 6 7 8; do |
|
17 | $ for i in 0 1 2 3 4 5 6 7 8; do | |
@@ -137,6 +138,7 b" Testing of the '--rev' flag" | |||||
137 | adding manifests |
|
138 | adding manifests | |
138 | adding file changes |
|
139 | adding file changes | |
139 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
140 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
|
141 | new changesets c70afb1ee985:faa2e4234c7a | |||
140 |
|
|
142 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
141 |
|
143 | |||
142 | $ hg verify |
|
144 | $ hg verify |
@@ -20,6 +20,7 b' Create repo a:' | |||||
20 | adding manifests |
|
20 | adding manifests | |
21 | adding file changes |
|
21 | adding file changes | |
22 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
22 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
23 | new changesets cd010b8cd998:02de42196ebe | |||
23 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
24 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
24 | $ hg up tip |
|
25 | $ hg up tip | |
25 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
26 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -641,6 +642,7 b' Rebase, collapse and copies' | |||||
641 | adding manifests |
|
642 | adding manifests | |
642 | adding file changes |
|
643 | adding file changes | |
643 | added 4 changesets with 11 changes to 7 files (+1 heads) |
|
644 | added 4 changesets with 11 changes to 7 files (+1 heads) | |
|
645 | new changesets f447d5abf5ea:338e84e2e558 | |||
644 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
646 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
645 | $ hg up -q tip |
|
647 | $ hg up -q tip | |
646 | $ hg tglog |
|
648 | $ hg tglog |
@@ -156,6 +156,7 b' Check that the right ancestors is used w' | |||||
156 | adding manifests |
|
156 | adding manifests | |
157 | adding file changes |
|
157 | adding file changes | |
158 | added 11 changesets with 8 changes to 3 files (+1 heads) |
|
158 | added 11 changesets with 8 changes to 3 files (+1 heads) | |
|
159 | new changesets 24797d4f68de:2f2496ddf49d | |||
159 | updating to branch default |
|
160 | updating to branch default | |
160 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
161 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
161 | $ cd issue4041 |
|
162 | $ cd issue4041 |
@@ -16,6 +16,7 b'' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
18 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
19 | new changesets cd010b8cd998:02de42196ebe | |||
19 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
20 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
20 | $ hg up tip |
|
21 | $ hg up tip | |
21 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -25,6 +25,7 b' Setup rebase canonical repo' | |||||
25 | adding manifests |
|
25 | adding manifests | |
26 | adding file changes |
|
26 | adding file changes | |
27 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
27 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
28 | new changesets cd010b8cd998:02de42196ebe | |||
28 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
29 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
29 | $ hg up tip |
|
30 | $ hg up tip | |
30 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
31 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -507,6 +508,7 b' test on rebase dropping a merge' | |||||
507 | adding manifests |
|
508 | adding manifests | |
508 | adding file changes |
|
509 | adding file changes | |
509 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
510 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
511 | new changesets cd010b8cd998:02de42196ebe | |||
510 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
512 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
511 | $ hg up 3 |
|
513 | $ hg up 3 | |
512 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
514 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -17,6 +17,7 b'' | |||||
17 | adding manifests |
|
17 | adding manifests | |
18 | adding file changes |
|
18 | adding file changes | |
19 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
19 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
20 | new changesets cd010b8cd998:02de42196ebe | |||
20 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
21 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
21 | $ hg up tip |
|
22 | $ hg up tip | |
22 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -54,6 +54,7 b' Now b has one revision to be pulled from' | |||||
54 | adding manifests |
|
54 | adding manifests | |
55 | adding file changes |
|
55 | adding file changes | |
56 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
56 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
57 | new changesets 77ae9631bcca | |||
57 | rebasing 2:ff8d69a621f9 "L1" |
|
58 | rebasing 2:ff8d69a621f9 "L1" | |
58 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
|
59 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) | |
59 |
|
60 | |||
@@ -143,6 +144,7 b' Invoke pull --rebase and nothing to reba' | |||||
143 | adding manifests |
|
144 | adding manifests | |
144 | adding file changes |
|
145 | adding file changes | |
145 | added 1 changesets with 1 changes to 1 files |
|
146 | added 1 changesets with 1 changes to 1 files | |
|
147 | new changesets 77ae9631bcca | |||
146 | nothing to rebase - updating instead |
|
148 | nothing to rebase - updating instead | |
147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
148 | updating bookmark norebase |
|
150 | updating bookmark norebase | |
@@ -210,6 +212,7 b' pull --rebase works when a specific revi' | |||||
210 | adding manifests |
|
212 | adding manifests | |
211 | adding file changes |
|
213 | adding file changes | |
212 | added 2 changesets with 2 changes to 2 files |
|
214 | added 2 changesets with 2 changes to 2 files | |
|
215 | new changesets 31cd3a05214e:770a61882ace | |||
213 | rebasing 3:ff8d69a621f9 "L1" |
|
216 | rebasing 3:ff8d69a621f9 "L1" | |
214 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
|
217 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) | |
215 | $ hg tglog |
|
218 | $ hg tglog | |
@@ -252,6 +255,7 b' pull --rebase works with bundle2 turned ' | |||||
252 | adding manifests |
|
255 | adding manifests | |
253 | adding file changes |
|
256 | adding file changes | |
254 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
257 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
258 | new changesets 00e3b7781125 | |||
255 | rebasing 5:518d153c0ba3 "L1" |
|
259 | rebasing 5:518d153c0ba3 "L1" | |
256 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) |
|
260 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) | |
257 | $ hg tglog |
|
261 | $ hg tglog | |
@@ -304,6 +308,7 b' pull --rebase only update if there is no' | |||||
304 | adding manifests |
|
308 | adding manifests | |
305 | adding file changes |
|
309 | adding file changes | |
306 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
310 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
311 | new changesets 88dd24261747 | |||
307 | rebasing 6:0d0727eb7ce0 "L1" |
|
312 | rebasing 6:0d0727eb7ce0 "L1" | |
308 | rebasing 7:c1f58876e3bf "L2" |
|
313 | rebasing 7:c1f58876e3bf "L2" | |
309 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) |
|
314 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) | |
@@ -345,6 +350,7 b' pull --rebase update (no rebase) use pro' | |||||
345 | adding manifests |
|
350 | adding manifests | |
346 | adding file changes |
|
351 | adding file changes | |
347 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
352 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
353 | new changesets 65bc164c1d9b | |||
348 | nothing to rebase - updating instead |
|
354 | nothing to rebase - updating instead | |
349 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
355 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
350 | updated to "65bc164c1d9b: R6" |
|
356 | updated to "65bc164c1d9b: R6" | |
@@ -394,6 +400,7 b' pre-existing heads.' | |||||
394 | adding manifests |
|
400 | adding manifests | |
395 | adding file changes |
|
401 | adding file changes | |
396 | added 1 changesets with 1 changes to 1 files |
|
402 | added 1 changesets with 1 changes to 1 files | |
|
403 | new changesets 39c381359968 | |||
397 | nothing to rebase |
|
404 | nothing to rebase | |
398 |
|
405 | |||
399 | There is two local heads and we pull a third one. |
|
406 | There is two local heads and we pull a third one. | |
@@ -420,6 +427,7 b' The second local head should not confuse' | |||||
420 | adding manifests |
|
427 | adding manifests | |
421 | adding file changes |
|
428 | adding file changes | |
422 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
429 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
430 | new changesets f7d3e42052f9 | |||
423 | rebasing 7:864e0a2d2614 "L1" |
|
431 | rebasing 7:864e0a2d2614 "L1" | |
424 | rebasing 8:6dc0ea5dcf55 "L2" |
|
432 | rebasing 8:6dc0ea5dcf55 "L2" | |
425 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) |
|
433 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) |
@@ -18,6 +18,7 b'' | |||||
18 | adding manifests |
|
18 | adding manifests | |
19 | adding file changes |
|
19 | adding file changes | |
20 | added 8 changesets with 7 changes to 7 files (+2 heads) |
|
20 | added 8 changesets with 7 changes to 7 files (+2 heads) | |
|
21 | new changesets cd010b8cd998:02de42196ebe | |||
21 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
22 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
22 | $ hg up tip |
|
23 | $ hg up tip | |
23 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -420,6 +421,7 b' All destination are B' | |||||
420 | adding manifests |
|
421 | adding manifests | |
421 | adding file changes |
|
422 | adding file changes | |
422 | added 9 changesets with 9 changes to 9 files (+2 heads) |
|
423 | added 9 changesets with 9 changes to 9 files (+2 heads) | |
|
424 | new changesets 9ae2ed22e576:479ddb54a924 | |||
423 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
425 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
424 | $ hg tglog |
|
426 | $ hg tglog | |
425 | o 8: 'I' |
|
427 | o 8: 'I' |
@@ -60,6 +60,7 b' clone and pull to break links' | |||||
60 | adding manifests |
|
60 | adding manifests | |
61 | adding file changes |
|
61 | adding file changes | |
62 | added 1 changesets with 2 changes to 2 files |
|
62 | added 1 changesets with 2 changes to 2 files | |
|
63 | new changesets 008c0c271c47 | |||
63 | updating to branch default |
|
64 | updating to branch default | |
64 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
65 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | $ cd clone |
|
66 | $ cd clone |
@@ -35,6 +35,7 b' Merge repositories:' | |||||
35 | adding manifests |
|
35 | adding manifests | |
36 | adding file changes |
|
36 | adding file changes | |
37 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
37 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
38 | new changesets d2ae7f538514 | |||
38 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
39 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
39 |
|
40 | |||
40 | $ hg merge |
|
41 | $ hg merge |
@@ -218,6 +218,7 b' Second scenario with two repos:' | |||||
218 | adding manifests |
|
218 | adding manifests | |
219 | adding file changes |
|
219 | adding file changes | |
220 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
220 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
221 | new changesets 7d51ed18da25 | |||
221 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
222 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
222 |
|
223 | |||
223 | $ hg merge |
|
224 | $ hg merge |
@@ -134,6 +134,7 b' test rollback on served repository' | |||||
134 | adding manifests |
|
134 | adding manifests | |
135 | adding file changes |
|
135 | adding file changes | |
136 | added 3 changesets with 2 changes to 1 files (+1 heads) |
|
136 | added 3 changesets with 2 changes to 1 files (+1 heads) | |
|
137 | new changesets 23b0221f3370:068774709090 | |||
137 | updating to branch default |
|
138 | updating to branch default | |
138 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
139 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
139 | $ cd u |
|
140 | $ cd u |
@@ -294,6 +294,7 b' One with >200 heads, which used to use u' | |||||
294 | adding manifests |
|
294 | adding manifests | |
295 | adding file changes |
|
295 | adding file changes | |
296 | added 1340 changesets with 0 changes to 0 files (+259 heads) |
|
296 | added 1340 changesets with 0 changes to 0 files (+259 heads) | |
|
297 | new changesets 1ea73414a91b:1c51e2c80832 | |||
297 | updating to branch a |
|
298 | updating to branch a | |
298 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
299 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
299 | $ hg clone -b b . b |
|
300 | $ hg clone -b b . b | |
@@ -301,6 +302,7 b' One with >200 heads, which used to use u' | |||||
301 | adding manifests |
|
302 | adding manifests | |
302 | adding file changes |
|
303 | adding file changes | |
303 | added 304 changesets with 0 changes to 0 files |
|
304 | added 304 changesets with 0 changes to 0 files | |
|
305 | new changesets 1ea73414a91b:513314ca8b3a | |||
304 | updating to branch b |
|
306 | updating to branch b | |
305 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
307 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
306 |
|
308 |
@@ -1088,6 +1088,7 b' no general delta' | |||||
1088 | adding manifests |
|
1088 | adding manifests | |
1089 | adding file changes |
|
1089 | adding file changes | |
1090 | added 5 changesets with 8 changes to 6 files |
|
1090 | added 5 changesets with 8 changes to 6 files | |
|
1091 | new changesets cc01e2b0c59f:33f7f61e6c5e | |||
1091 | updating to branch default |
|
1092 | updating to branch default | |
1092 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1093 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1093 | $ cd bundle1 |
|
1094 | $ cd bundle1 | |
@@ -1108,6 +1109,7 b' with general delta' | |||||
1108 | adding manifests |
|
1109 | adding manifests | |
1109 | adding file changes |
|
1110 | adding file changes | |
1110 | added 5 changesets with 8 changes to 6 files |
|
1111 | added 5 changesets with 8 changes to 6 files | |
|
1112 | new changesets cc01e2b0c59f:33f7f61e6c5e | |||
1111 | updating to branch default |
|
1113 | updating to branch default | |
1112 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1114 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1113 | $ cd bundle2 |
|
1115 | $ cd bundle2 |
@@ -30,6 +30,7 b'' | |||||
30 | adding manifests |
|
30 | adding manifests | |
31 | adding file changes |
|
31 | adding file changes | |
32 | added 1 changesets with 1 changes to 1 files |
|
32 | added 1 changesets with 1 changes to 1 files | |
|
33 | new changesets 30aff43faee1 | |||
33 | (run 'hg update' to get a working copy) |
|
34 | (run 'hg update' to get a working copy) | |
34 |
|
35 | |||
35 | $ hg verify |
|
36 | $ hg verify |
@@ -102,6 +102,7 b' clone remote via pull' | |||||
102 | adding manifests |
|
102 | adding manifests | |
103 | adding file changes |
|
103 | adding file changes | |
104 | added 3 changesets with 2 changes to 2 files |
|
104 | added 3 changesets with 2 changes to 2 files | |
|
105 | new changesets 1160648e36ce:ad076bfb429d | |||
105 | updating to branch default |
|
106 | updating to branch default | |
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
107 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 |
|
108 | |||
@@ -313,6 +314,7 b' clone bookmarks' | |||||
313 | adding manifests |
|
314 | adding manifests | |
314 | adding file changes |
|
315 | adding file changes | |
315 | added 6 changesets with 5 changes to 4 files (+1 heads) |
|
316 | added 6 changesets with 5 changes to 4 files (+1 heads) | |
|
317 | new changesets 1160648e36ce:1383141674ec | |||
316 | updating to branch default |
|
318 | updating to branch default | |
317 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
319 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
318 | $ hg -R local-bookmarks bookmarks |
|
320 | $ hg -R local-bookmarks bookmarks | |
@@ -400,6 +402,7 b' Test hg-ssh in read-only mode:' | |||||
400 | adding manifests |
|
402 | adding manifests | |
401 | adding file changes |
|
403 | adding file changes | |
402 | added 6 changesets with 5 changes to 4 files (+1 heads) |
|
404 | added 6 changesets with 5 changes to 4 files (+1 heads) | |
|
405 | new changesets 1160648e36ce:1383141674ec | |||
403 | updating to branch default |
|
406 | updating to branch default | |
404 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
407 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
405 |
|
408 |
@@ -9,6 +9,7 b" creating 'remote' repo" | |||||
9 | adding manifests |
|
9 | adding manifests | |
10 | adding file changes |
|
10 | adding file changes | |
11 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
11 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
|
12 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
13 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 | $ hg up tip |
|
14 | $ hg up tip | |
14 | 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 | |
@@ -27,6 +28,7 b' clone remote via stream' | |||||
27 | adding manifests |
|
28 | adding manifests | |
28 | adding file changes |
|
29 | adding file changes | |
29 | added 1 changesets with 1 changes to 1 files |
|
30 | added 1 changesets with 1 changes to 1 files | |
|
31 | new changesets bfaf4b5cbf01 | |||
30 | updating to branch default |
|
32 | updating to branch default | |
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
32 | checking changesets |
|
34 | checking changesets | |
@@ -38,6 +40,7 b' clone remote via stream' | |||||
38 | adding manifests |
|
40 | adding manifests | |
39 | adding file changes |
|
41 | adding file changes | |
40 | added 2 changesets with 2 changes to 1 files |
|
42 | added 2 changesets with 2 changes to 1 files | |
|
43 | new changesets bfaf4b5cbf01:21f32785131f | |||
41 | updating to branch default |
|
44 | updating to branch default | |
42 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
43 | checking changesets |
|
46 | checking changesets | |
@@ -49,6 +52,7 b' clone remote via stream' | |||||
49 | adding manifests |
|
52 | adding manifests | |
50 | adding file changes |
|
53 | adding file changes | |
51 | added 3 changesets with 3 changes to 1 files |
|
54 | added 3 changesets with 3 changes to 1 files | |
|
55 | new changesets bfaf4b5cbf01:4ce51a113780 | |||
52 | updating to branch default |
|
56 | updating to branch default | |
53 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
57 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
54 | checking changesets |
|
58 | checking changesets | |
@@ -60,6 +64,7 b' clone remote via stream' | |||||
60 | adding manifests |
|
64 | adding manifests | |
61 | adding file changes |
|
65 | adding file changes | |
62 | added 4 changesets with 4 changes to 1 files |
|
66 | added 4 changesets with 4 changes to 1 files | |
|
67 | new changesets bfaf4b5cbf01:93ee6ab32777 | |||
63 | updating to branch default |
|
68 | updating to branch default | |
64 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
65 | checking changesets |
|
70 | checking changesets | |
@@ -71,6 +76,7 b' clone remote via stream' | |||||
71 | adding manifests |
|
76 | adding manifests | |
72 | adding file changes |
|
77 | adding file changes | |
73 | added 2 changesets with 2 changes to 1 files |
|
78 | added 2 changesets with 2 changes to 1 files | |
|
79 | new changesets bfaf4b5cbf01:c70afb1ee985 | |||
74 | updating to branch default |
|
80 | updating to branch default | |
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | checking changesets |
|
82 | checking changesets | |
@@ -82,6 +88,7 b' clone remote via stream' | |||||
82 | adding manifests |
|
88 | adding manifests | |
83 | adding file changes |
|
89 | adding file changes | |
84 | added 3 changesets with 3 changes to 1 files |
|
90 | added 3 changesets with 3 changes to 1 files | |
|
91 | new changesets bfaf4b5cbf01:f03ae5a9b979 | |||
85 | updating to branch default |
|
92 | updating to branch default | |
86 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 | checking changesets |
|
94 | checking changesets | |
@@ -93,6 +100,7 b' clone remote via stream' | |||||
93 | adding manifests |
|
100 | adding manifests | |
94 | adding file changes |
|
101 | adding file changes | |
95 | added 4 changesets with 5 changes to 2 files |
|
102 | added 4 changesets with 5 changes to 2 files | |
|
103 | new changesets bfaf4b5cbf01:095cb14b1b4d | |||
96 | updating to branch default |
|
104 | updating to branch default | |
97 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
105 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 | checking changesets |
|
106 | checking changesets | |
@@ -104,6 +112,7 b' clone remote via stream' | |||||
104 | adding manifests |
|
112 | adding manifests | |
105 | adding file changes |
|
113 | adding file changes | |
106 | added 5 changesets with 6 changes to 3 files |
|
114 | added 5 changesets with 6 changes to 3 files | |
|
115 | new changesets bfaf4b5cbf01:faa2e4234c7a | |||
107 | updating to branch default |
|
116 | updating to branch default | |
108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
109 | checking changesets |
|
118 | checking changesets | |
@@ -115,6 +124,7 b' clone remote via stream' | |||||
115 | adding manifests |
|
124 | adding manifests | |
116 | adding file changes |
|
125 | adding file changes | |
117 | added 5 changesets with 5 changes to 2 files |
|
126 | added 5 changesets with 5 changes to 2 files | |
|
127 | new changesets bfaf4b5cbf01:916f1afdef90 | |||
118 | updating to branch default |
|
128 | updating to branch default | |
119 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
120 | checking changesets |
|
130 | checking changesets | |
@@ -130,6 +140,7 b' clone remote via stream' | |||||
130 | adding manifests |
|
140 | adding manifests | |
131 | adding file changes |
|
141 | adding file changes | |
132 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
142 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
|
143 | new changesets c70afb1ee985:faa2e4234c7a | |||
133 |
|
|
144 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
134 | $ hg verify |
|
145 | $ hg verify | |
135 | checking changesets |
|
146 | checking changesets | |
@@ -146,6 +157,7 b' clone remote via stream' | |||||
146 | adding manifests |
|
157 | adding manifests | |
147 | adding file changes |
|
158 | adding file changes | |
148 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
159 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
160 | new changesets c70afb1ee985 | |||
149 |
|
|
161 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
150 | $ hg verify |
|
162 | $ hg verify | |
151 | checking changesets |
|
163 | checking changesets | |
@@ -160,6 +172,7 b' clone remote via stream' | |||||
160 | adding manifests |
|
172 | adding manifests | |
161 | adding file changes |
|
173 | adding file changes | |
162 | added 6 changesets with 5 changes to 4 files |
|
174 | added 6 changesets with 5 changes to 4 files | |
|
175 | new changesets 4ce51a113780:916f1afdef90 | |||
163 | (run 'hg update' to get a working copy) |
|
176 | (run 'hg update' to get a working copy) | |
164 | $ cd .. |
|
177 | $ cd .. | |
165 | $ cd test-2 |
|
178 | $ cd test-2 | |
@@ -170,6 +183,7 b' clone remote via stream' | |||||
170 | adding manifests |
|
183 | adding manifests | |
171 | adding file changes |
|
184 | adding file changes | |
172 | added 2 changesets with 0 changes to 0 files (+1 heads) |
|
185 | added 2 changesets with 0 changes to 0 files (+1 heads) | |
|
186 | new changesets c70afb1ee985:f03ae5a9b979 | |||
173 |
|
|
187 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
174 | $ hg verify |
|
188 | $ hg verify | |
175 | checking changesets |
|
189 | checking changesets | |
@@ -184,6 +198,7 b' clone remote via stream' | |||||
184 | adding manifests |
|
198 | adding manifests | |
185 | adding file changes |
|
199 | adding file changes | |
186 | added 4 changesets with 4 changes to 4 files |
|
200 | added 4 changesets with 4 changes to 4 files | |
|
201 | new changesets 93ee6ab32777:916f1afdef90 | |||
187 | (run 'hg update' to get a working copy) |
|
202 | (run 'hg update' to get a working copy) | |
188 | $ hg verify |
|
203 | $ hg verify | |
189 | checking changesets |
|
204 | checking changesets |
@@ -96,6 +96,7 b' clone remote via pull' | |||||
96 | adding manifests |
|
96 | adding manifests | |
97 | adding file changes |
|
97 | adding file changes | |
98 | added 3 changesets with 2 changes to 2 files |
|
98 | added 3 changesets with 2 changes to 2 files | |
|
99 | new changesets 1160648e36ce:ad076bfb429d | |||
99 | updating to branch default |
|
100 | updating to branch default | |
100 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
101 |
|
102 | |||
@@ -317,6 +318,7 b' clone bookmarks' | |||||
317 | adding manifests |
|
318 | adding manifests | |
318 | adding file changes |
|
319 | adding file changes | |
319 | added 6 changesets with 5 changes to 4 files (+1 heads) |
|
320 | added 6 changesets with 5 changes to 4 files (+1 heads) | |
|
321 | new changesets 1160648e36ce:1383141674ec | |||
320 | updating to branch default |
|
322 | updating to branch default | |
321 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
323 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
322 | $ hg -R local-bookmarks bookmarks |
|
324 | $ hg -R local-bookmarks bookmarks | |
@@ -417,6 +419,7 b' Test hg-ssh in read-only mode:' | |||||
417 | adding manifests |
|
419 | adding manifests | |
418 | adding file changes |
|
420 | adding file changes | |
419 | added 6 changesets with 5 changes to 4 files (+1 heads) |
|
421 | added 6 changesets with 5 changes to 4 files (+1 heads) | |
|
422 | new changesets 1160648e36ce:1383141674ec | |||
420 | updating to branch default |
|
423 | updating to branch default | |
421 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
424 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
422 |
|
425 |
@@ -33,6 +33,7 b' one pull' | |||||
33 | adding manifests |
|
33 | adding manifests | |
34 | adding file changes |
|
34 | adding file changes | |
35 | added 1 changesets with 2 changes to 2 files |
|
35 | added 1 changesets with 2 changes to 2 files | |
|
36 | new changesets 02770d679fb8 | |||
36 | updating to branch default |
|
37 | updating to branch default | |
37 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
38 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
38 | $ cd local |
|
39 | $ cd local | |
@@ -64,6 +65,7 b' check for HTTP opener failures when cach' | |||||
64 | adding manifests |
|
65 | adding manifests | |
65 | adding file changes |
|
66 | adding file changes | |
66 | added 1 changesets with 1 changes to 1 files |
|
67 | added 1 changesets with 1 changes to 1 files | |
|
68 | new changesets 4ac2e3648604 | |||
67 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT/remote |
|
69 | changegroup hook: HG_HOOKNAME=changegroup HG_HOOKTYPE=changegroup HG_NODE=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_NODE_LAST=4ac2e3648604439c580c69b09ec9d93a88d93432 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_URL=http://localhost:$HGPORT/remote | |
68 | (run 'hg update' to get a working copy) |
|
70 | (run 'hg update' to get a working copy) | |
69 |
|
71 | |||
@@ -89,6 +91,7 b' trying clone -r' | |||||
89 | adding manifests |
|
91 | adding manifests | |
90 | adding file changes |
|
92 | adding file changes | |
91 | added 1 changesets with 2 changes to 2 files |
|
93 | added 1 changesets with 2 changes to 2 files | |
|
94 | new changesets 02770d679fb8 | |||
92 | updating to branch default |
|
95 | updating to branch default | |
93 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 |
|
97 | |||
@@ -110,6 +113,7 b' test with "/" URI (issue747) and subrepo' | |||||
110 | adding manifests |
|
113 | adding manifests | |
111 | adding file changes |
|
114 | adding file changes | |
112 | added 1 changesets with 3 changes to 3 files |
|
115 | added 1 changesets with 3 changes to 3 files | |
|
116 | new changesets a9ebfbe8e587 | |||
113 | updating to branch default |
|
117 | updating to branch default | |
114 | cloning subrepo sub from static-http://localhost:$HGPORT/sub |
|
118 | cloning subrepo sub from static-http://localhost:$HGPORT/sub | |
115 | requesting all changes |
|
119 | requesting all changes | |
@@ -117,6 +121,7 b' test with "/" URI (issue747) and subrepo' | |||||
117 | adding manifests |
|
121 | adding manifests | |
118 | adding file changes |
|
122 | adding file changes | |
119 | added 2 changesets with 2 changes to 2 files |
|
123 | added 2 changesets with 2 changes to 2 files | |
|
124 | new changesets be090ea66256:322ea90975df | |||
120 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
125 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
121 | $ cd local2 |
|
126 | $ cd local2 | |
122 | $ hg verify |
|
127 | $ hg verify | |
@@ -182,6 +187,7 b' Clone with tags and branches works' | |||||
182 | adding manifests |
|
187 | adding manifests | |
183 | adding file changes |
|
188 | adding file changes | |
184 | added 5 changesets with 5 changes to 2 files (+1 heads) |
|
189 | added 5 changesets with 5 changes to 2 files (+1 heads) | |
|
190 | new changesets 68986213bd44:0c325bd2b5a7 | |||
185 | updating to branch default |
|
191 | updating to branch default | |
186 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
192 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
187 |
|
193 | |||
@@ -192,6 +198,7 b' Clone a specific branch works' | |||||
192 | adding manifests |
|
198 | adding manifests | |
193 | adding file changes |
|
199 | adding file changes | |
194 | added 4 changesets with 4 changes to 2 files |
|
200 | added 4 changesets with 4 changes to 2 files | |
|
201 | new changesets 68986213bd44:0c325bd2b5a7 | |||
195 | updating to branch mybranch |
|
202 | updating to branch mybranch | |
196 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
197 |
|
204 | |||
@@ -202,6 +209,7 b' Clone a specific tag works' | |||||
202 | adding manifests |
|
209 | adding manifests | |
203 | adding file changes |
|
210 | adding file changes | |
204 | added 2 changesets with 2 changes to 1 files |
|
211 | added 2 changesets with 2 changes to 1 files | |
|
212 | new changesets 68986213bd44:4ee3fcef1c80 | |||
205 | updating to branch default |
|
213 | updating to branch default | |
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
214 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
207 |
|
215 |
@@ -223,6 +223,7 b'' | |||||
223 | adding manifests |
|
223 | adding manifests | |
224 | adding file changes |
|
224 | adding file changes | |
225 | added 1 changesets with 0 changes to 0 files (+1 heads) |
|
225 | added 1 changesets with 0 changes to 0 files (+1 heads) | |
|
226 | new changesets 264128213d29 | |||
226 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
227 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
227 | $ rm .hg/strip-backup/* |
|
228 | $ rm .hg/strip-backup/* | |
228 | $ hg log --graph |
|
229 | $ hg log --graph | |
@@ -1114,6 +1115,7 b' test stripping a working directory paren' | |||||
1114 | adding manifests |
|
1115 | adding manifests | |
1115 | adding file changes |
|
1116 | adding file changes | |
1116 | added 2 changesets with 1 changes to 1 files |
|
1117 | added 2 changesets with 1 changes to 1 files | |
|
1118 | new changesets 35358f982181:4cf5e92caec2 | |||
1117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1119 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1118 |
|
1120 | |||
1119 | $ hg strip -k -r 35358f982181 |
|
1121 | $ hg strip -k -r 35358f982181 |
@@ -104,6 +104,7 b" are also available as siblings of 'main'" | |||||
104 | adding manifests |
|
104 | adding manifests | |
105 | adding file changes |
|
105 | adding file changes | |
106 | added 1 changesets with 3 changes to 3 files |
|
106 | added 1 changesets with 3 changes to 3 files | |
|
107 | new changesets 7f491f53a367 | |||
107 | updating to branch default |
|
108 | updating to branch default | |
108 | abort: HTTP Error 404: Not Found |
|
109 | abort: HTTP Error 404: Not Found | |
109 | [255] |
|
110 | [255] |
@@ -173,6 +173,7 b' user a pulls, merges, commits' | |||||
173 | adding manifests |
|
173 | adding manifests | |
174 | adding file changes |
|
174 | adding file changes | |
175 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
175 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
176 | new changesets 089416c11d73 | |||
176 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
177 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
177 | $ hg merge 2>/dev/null |
|
178 | $ hg merge 2>/dev/null | |
178 | subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
|
179 | subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
@@ -269,6 +269,7 b' Status between revisions:' | |||||
269 | adding manifests |
|
269 | adding manifests | |
270 | adding file changes |
|
270 | adding file changes | |
271 | added 3 changesets with 5 changes to 3 files |
|
271 | added 3 changesets with 5 changes to 3 files | |
|
272 | new changesets 23376cbba0d8:1326fa26d0c0 | |||
272 | updating to branch default |
|
273 | updating to branch default | |
273 | cloning subrepo foo from http://localhost:$HGPORT/foo |
|
274 | cloning subrepo foo from http://localhost:$HGPORT/foo | |
274 | requesting all changes |
|
275 | requesting all changes | |
@@ -276,12 +277,14 b' Status between revisions:' | |||||
276 | adding manifests |
|
277 | adding manifests | |
277 | adding file changes |
|
278 | adding file changes | |
278 | added 4 changesets with 7 changes to 3 files |
|
279 | added 4 changesets with 7 changes to 3 files | |
|
280 | new changesets af048e97ade2:65903cebad86 | |||
279 | cloning subrepo foo/bar from http://localhost:$HGPORT/foo/bar (glob) |
|
281 | cloning subrepo foo/bar from http://localhost:$HGPORT/foo/bar (glob) | |
280 | requesting all changes |
|
282 | requesting all changes | |
281 | adding changesets |
|
283 | adding changesets | |
282 | adding manifests |
|
284 | adding manifests | |
283 | adding file changes |
|
285 | adding file changes | |
284 | added 3 changesets with 3 changes to 1 files |
|
286 | added 3 changesets with 3 changes to 1 files | |
|
287 | new changesets 4904098473f9:31ecbdafd357 | |||
285 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
288 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
286 |
|
289 | |||
287 | $ cat clone/foo/bar/z.txt |
|
290 | $ cat clone/foo/bar/z.txt |
@@ -47,6 +47,7 b' Clone main from hgweb' | |||||
47 | adding manifests |
|
47 | adding manifests | |
48 | adding file changes |
|
48 | adding file changes | |
49 | added 1 changesets with 3 changes to 3 files |
|
49 | added 1 changesets with 3 changes to 3 files | |
|
50 | new changesets fdfeeb3e979e | |||
50 | updating to branch default |
|
51 | updating to branch default | |
51 | cloning subrepo sub from http://localhost:$HGPORT/sub |
|
52 | cloning subrepo sub from http://localhost:$HGPORT/sub | |
52 | requesting all changes |
|
53 | requesting all changes | |
@@ -54,6 +55,7 b' Clone main from hgweb' | |||||
54 | adding manifests |
|
55 | adding manifests | |
55 | adding file changes |
|
56 | adding file changes | |
56 | added 1 changesets with 1 changes to 1 files |
|
57 | added 1 changesets with 1 changes to 1 files | |
|
58 | new changesets 863c1745b441 | |||
57 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
58 |
|
60 | |||
59 | Checking cloned repo ids |
|
61 | Checking cloned repo ids | |
@@ -80,6 +82,7 b' subrepo paths with ssh urls' | |||||
80 | adding manifests |
|
82 | adding manifests | |
81 | adding file changes |
|
83 | adding file changes | |
82 | added 1 changesets with 3 changes to 3 files |
|
84 | added 1 changesets with 3 changes to 3 files | |
|
85 | new changesets fdfeeb3e979e | |||
83 | updating to branch default |
|
86 | updating to branch default | |
84 | cloning subrepo sub from ssh://user@dummy/sub |
|
87 | cloning subrepo sub from ssh://user@dummy/sub | |
85 | requesting all changes |
|
88 | requesting all changes | |
@@ -87,6 +90,7 b' subrepo paths with ssh urls' | |||||
87 | adding manifests |
|
90 | adding manifests | |
88 | adding file changes |
|
91 | adding file changes | |
89 | added 1 changesets with 1 changes to 1 files |
|
92 | added 1 changesets with 1 changes to 1 files | |
|
93 | new changesets 863c1745b441 | |||
90 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 |
|
95 | |||
92 | $ hg -R sshclone push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned |
|
96 | $ hg -R sshclone push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned |
@@ -708,6 +708,7 b' pull' | |||||
708 | adding manifests |
|
708 | adding manifests | |
709 | adding file changes |
|
709 | adding file changes | |
710 | added 1 changesets with 1 changes to 1 files |
|
710 | added 1 changesets with 1 changes to 1 files | |
|
711 | new changesets 925c17564ef8 | |||
711 | (run 'hg update' to get a working copy) |
|
712 | (run 'hg update' to get a working copy) | |
712 |
|
713 | |||
713 | should pull t |
|
714 | should pull t | |
@@ -737,6 +738,7 b' should pull t' | |||||
737 | adding manifests |
|
738 | adding manifests | |
738 | adding file changes |
|
739 | adding file changes | |
739 | added 1 changesets with 1 changes to 1 files |
|
740 | added 1 changesets with 1 changes to 1 files | |
|
741 | new changesets 52c0adc0515a | |||
740 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
742 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
741 | updated to "925c17564ef8: 13" |
|
743 | updated to "925c17564ef8: 13" | |
742 | 2 other heads for branch "default" |
|
744 | 2 other heads for branch "default" | |
@@ -1053,6 +1055,7 b' Create repo without default path, pull t' | |||||
1053 | adding manifests |
|
1055 | adding manifests | |
1054 | adding file changes |
|
1056 | adding file changes | |
1055 | added 2 changesets with 3 changes to 2 files |
|
1057 | added 2 changesets with 3 changes to 2 files | |
|
1058 | new changesets 19487b456929:be5eb94e7215 | |||
1056 | (run 'hg update' to get a working copy) |
|
1059 | (run 'hg update' to get a working copy) | |
1057 | $ hg -R issue1852b update |
|
1060 | $ hg -R issue1852b update | |
1058 | abort: default path for subrepository not found (in subrepository "sub/repo") (glob) |
|
1061 | abort: default path for subrepository not found (in subrepository "sub/repo") (glob) | |
@@ -1079,6 +1082,7 b' Try the same, but with pull -u' | |||||
1079 | adding manifests |
|
1082 | adding manifests | |
1080 | adding file changes |
|
1083 | adding file changes | |
1081 | added 1 changesets with 2 changes to 2 files |
|
1084 | added 1 changesets with 2 changes to 2 files | |
|
1085 | new changesets 19487b456929 | |||
1082 | cloning subrepo sub/repo from issue1852a/sub/repo (glob) |
|
1086 | cloning subrepo sub/repo from issue1852a/sub/repo (glob) | |
1083 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1087 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1084 |
|
1088 | |||
@@ -1140,6 +1144,7 b" Check that merge of a new subrepo doesn'" | |||||
1140 | adding manifests |
|
1144 | adding manifests | |
1141 | adding file changes |
|
1145 | adding file changes | |
1142 | added 1 changesets with 2 changes to 2 files |
|
1146 | added 1 changesets with 2 changes to 2 files | |
|
1147 | new changesets c82b79fdcc5b | |||
1143 | subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) |
|
1148 | subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) | |
1144 | (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
|
1149 | (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m | |
1145 | pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob) |
|
1150 | pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob) | |
@@ -1148,6 +1153,7 b" Check that merge of a new subrepo doesn'" | |||||
1148 | adding manifests |
|
1153 | adding manifests | |
1149 | adding file changes |
|
1154 | adding file changes | |
1150 | added 1 changesets with 1 changes to 1 files |
|
1155 | added 1 changesets with 1 changes to 1 files | |
|
1156 | new changesets 46cd4aac504c | |||
1151 | subrepository sources for sub/repo differ (glob) |
|
1157 | subrepository sources for sub/repo differ (glob) | |
1152 | use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l |
|
1158 | use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l | |
1153 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1159 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -3,6 +3,7 b' adding changesets' | |||||
3 | adding manifests |
|
3 | adding manifests | |
4 | adding file changes |
|
4 | adding file changes | |
5 | added 1 changesets with 4 changes to 4 files |
|
5 | added 1 changesets with 4 changes to 4 files | |
|
6 | new changesets d326ae2d01ee | |||
6 | updating to branch default |
|
7 | updating to branch default | |
7 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 | requesting all changes |
|
9 | requesting all changes | |
@@ -10,5 +11,6 b' adding changesets' | |||||
10 | adding manifests |
|
11 | adding manifests | |
11 | adding file changes |
|
12 | adding file changes | |
12 | added 1 changesets with 4 changes to 4 files |
|
13 | added 1 changesets with 4 changes to 4 files | |
|
14 | new changesets d326ae2d01ee | |||
13 | updating to branch default |
|
15 | updating to branch default | |
14 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -624,6 +624,7 b' check that we can merge tags that differ' | |||||
624 | adding manifests |
|
624 | adding manifests | |
625 | adding file changes |
|
625 | adding file changes | |
626 | added 6 changesets with 6 changes to 3 files (+1 heads) |
|
626 | added 6 changesets with 6 changes to 3 files (+1 heads) | |
|
627 | new changesets 9aa4e1292a27:b325cc5b642c | |||
627 | hook: tag changes detected |
|
628 | hook: tag changes detected | |
628 | hook: +A 929bca7b18d067cbf3844c3896319a940059d748 t2 |
|
629 | hook: +A 929bca7b18d067cbf3844c3896319a940059d748 t2 | |
629 | hook: +A 9aa4e1292a27a248f8d07339bed9931d54907be7 t4 |
|
630 | hook: +A 9aa4e1292a27a248f8d07339bed9931d54907be7 t4 |
@@ -669,6 +669,7 b' Cloning should pull down hgtags fnodes m' | |||||
669 | adding manifests |
|
669 | adding manifests | |
670 | adding file changes |
|
670 | adding file changes | |
671 | added 4 changesets with 4 changes to 2 files |
|
671 | added 4 changesets with 4 changes to 2 files | |
|
672 | new changesets 96ee1d7354c4:40f0358cb314 | |||
672 | updating to branch default |
|
673 | updating to branch default | |
673 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
674 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
674 |
|
675 |
@@ -262,6 +262,7 b' test same-parent transplant with --log' | |||||
262 | adding manifests |
|
262 | adding manifests | |
263 | adding file changes |
|
263 | adding file changes | |
264 | added 2 changesets with 2 changes to 2 files |
|
264 | added 2 changesets with 2 changes to 2 files | |
|
265 | new changesets 17ab29e464c6:d11e3596cc1a | |||
265 | updating to branch default |
|
266 | updating to branch default | |
266 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
267 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
267 | $ cd ../sameparent |
|
268 | $ cd ../sameparent | |
@@ -282,6 +283,7 b' format-breaking diffopts' | |||||
282 | adding manifests |
|
283 | adding manifests | |
283 | adding file changes |
|
284 | adding file changes | |
284 | added 2 changesets with 2 changes to 2 files |
|
285 | added 2 changesets with 2 changes to 2 files | |
|
286 | new changesets 17ab29e464c6:d11e3596cc1a | |||
285 | updating to branch default |
|
287 | updating to branch default | |
286 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
288 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
287 | $ cd ../remote |
|
289 | $ cd ../remote | |
@@ -339,6 +341,7 b' remote transplant with pull' | |||||
339 | adding manifests |
|
341 | adding manifests | |
340 | adding file changes |
|
342 | adding file changes | |
341 | added 1 changesets with 1 changes to 1 files |
|
343 | added 1 changesets with 1 changes to 1 files | |
|
344 | new changesets 17ab29e464c6 | |||
342 | updating to branch default |
|
345 | updating to branch default | |
343 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
346 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
344 | $ cd ../rp |
|
347 | $ cd ../rp | |
@@ -351,6 +354,7 b' remote transplant with pull' | |||||
351 | added 1 changesets with 1 changes to 1 files |
|
354 | added 1 changesets with 1 changes to 1 files | |
352 | applying a53251cdf717 |
|
355 | applying a53251cdf717 | |
353 | a53251cdf717 transplanted to 8d9279348abb |
|
356 | a53251cdf717 transplanted to 8d9279348abb | |
|
357 | new changesets 37a1297eb21b:8d9279348abb | |||
354 | $ hg log --template '{rev} {parents} {desc}\n' |
|
358 | $ hg log --template '{rev} {parents} {desc}\n' | |
355 | 2 b3 |
|
359 | 2 b3 | |
356 | 1 b1 |
|
360 | 1 b1 | |
@@ -542,6 +546,7 b' test transplant into empty repository' | |||||
542 | adding manifests |
|
546 | adding manifests | |
543 | adding file changes |
|
547 | adding file changes | |
544 | added 4 changesets with 4 changes to 4 files |
|
548 | added 4 changesets with 4 changes to 4 files | |
|
549 | new changesets 17ab29e464c6:a53251cdf717 | |||
545 |
|
550 | |||
546 | test "--merge" causing pull from source repository on local host |
|
551 | test "--merge" causing pull from source repository on local host | |
547 |
|
552 | |||
@@ -555,6 +560,7 b' test "--merge" causing pull from source ' | |||||
555 | added 2 changesets with 2 changes to 2 files |
|
560 | added 2 changesets with 2 changes to 2 files | |
556 | applying a53251cdf717 |
|
561 | applying a53251cdf717 | |
557 | 4:a53251cdf717 merged at 4831f4dc831a |
|
562 | 4:a53251cdf717 merged at 4831f4dc831a | |
|
563 | new changesets 722f4667af76:4831f4dc831a | |||
558 |
|
564 | |||
559 | test interactive transplant |
|
565 | test interactive transplant | |
560 |
|
566 | |||
@@ -845,6 +851,7 b' test transplanting a patch turning into ' | |||||
845 | adding manifests |
|
851 | adding manifests | |
846 | adding file changes |
|
852 | adding file changes | |
847 | added 1 changesets with 1 changes to 1 files |
|
853 | added 1 changesets with 1 changes to 1 files | |
|
854 | new changesets 07f494440405 | |||
848 | updating to branch default |
|
855 | updating to branch default | |
849 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
856 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
850 | $ cd binarydest |
|
857 | $ cd binarydest |
@@ -155,6 +155,7 b' Local is empty:' | |||||
155 | adding manifests |
|
155 | adding manifests | |
156 | adding file changes |
|
156 | adding file changes | |
157 | added 12 changesets with 24 changes to 2 files |
|
157 | added 12 changesets with 24 changes to 2 files | |
|
158 | new changesets d57206cc072a:a19bfa7e7328 | |||
158 | (run 'hg update' to get a working copy) |
|
159 | (run 'hg update' to get a working copy) | |
159 | $ hg incoming $remote |
|
160 | $ hg incoming $remote | |
160 | comparing with http://localhost:$HGPORT/ |
|
161 | comparing with http://localhost:$HGPORT/ | |
@@ -171,6 +172,7 b' Local is subset:' | |||||
171 | adding manifests |
|
172 | adding manifests | |
172 | adding file changes |
|
173 | adding file changes | |
173 | added 6 changesets with 12 changes to 2 files |
|
174 | added 6 changesets with 12 changes to 2 files | |
|
175 | new changesets d57206cc072a:d8f638ac69e9 | |||
174 | updating to branch name2 |
|
176 | updating to branch name2 | |
175 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
177 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
176 | $ cp $HGRCPATH-nocap $HGRCPATH |
|
178 | $ cp $HGRCPATH-nocap $HGRCPATH | |
@@ -200,6 +202,7 b' Local is subset:' | |||||
200 | adding manifests |
|
202 | adding manifests | |
201 | adding file changes |
|
203 | adding file changes | |
202 | added 6 changesets with 12 changes to 2 files |
|
204 | added 6 changesets with 12 changes to 2 files | |
|
205 | new changesets a7892891da29:a19bfa7e7328 | |||
203 | (run 'hg update' to get a working copy) |
|
206 | (run 'hg update' to get a working copy) | |
204 | $ hg incoming $remote |
|
207 | $ hg incoming $remote | |
205 | comparing with http://localhost:$HGPORT/ |
|
208 | comparing with http://localhost:$HGPORT/ | |
@@ -258,6 +261,7 b' Local is superset:' | |||||
258 | adding manifests |
|
261 | adding manifests | |
259 | adding file changes |
|
262 | adding file changes | |
260 | added 6 changesets with 12 changes to 2 files |
|
263 | added 6 changesets with 12 changes to 2 files | |
|
264 | new changesets d57206cc072a:d8f638ac69e9 | |||
261 | updating to branch name2 |
|
265 | updating to branch name2 | |
262 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
266 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
263 | $ tstart subset2 |
|
267 | $ tstart subset2 |
@@ -140,6 +140,7 b' Local is empty:' | |||||
140 | adding manifests |
|
140 | adding manifests | |
141 | adding file changes |
|
141 | adding file changes | |
142 | added 12 changesets with 24 changes to 2 files |
|
142 | added 12 changesets with 24 changes to 2 files | |
|
143 | new changesets d57206cc072a:a19bfa7e7328 | |||
143 | (run 'hg update' to get a working copy) |
|
144 | (run 'hg update' to get a working copy) | |
144 | $ hg incoming $remote |
|
145 | $ hg incoming $remote | |
145 | comparing with http://localhost:$HGPORT/ |
|
146 | comparing with http://localhost:$HGPORT/ | |
@@ -155,6 +156,7 b' Local is subset:' | |||||
155 | adding manifests |
|
156 | adding manifests | |
156 | adding file changes |
|
157 | adding file changes | |
157 | added 6 changesets with 12 changes to 2 files |
|
158 | added 6 changesets with 12 changes to 2 files | |
|
159 | new changesets d57206cc072a:d8f638ac69e9 | |||
158 | updating to branch name2 |
|
160 | updating to branch name2 | |
159 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
161 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 | $ hg incoming $remote |
|
162 | $ hg incoming $remote | |
@@ -183,6 +185,7 b' Local is subset:' | |||||
183 | adding manifests |
|
185 | adding manifests | |
184 | adding file changes |
|
186 | adding file changes | |
185 | added 6 changesets with 12 changes to 2 files |
|
187 | added 6 changesets with 12 changes to 2 files | |
|
188 | new changesets a7892891da29:a19bfa7e7328 | |||
186 | (run 'hg update' to get a working copy) |
|
189 | (run 'hg update' to get a working copy) | |
187 | $ hg incoming $remote |
|
190 | $ hg incoming $remote | |
188 | comparing with http://localhost:$HGPORT/ |
|
191 | comparing with http://localhost:$HGPORT/ | |
@@ -242,6 +245,7 b' Local is superset:' | |||||
242 | adding manifests |
|
245 | adding manifests | |
243 | adding file changes |
|
246 | adding file changes | |
244 | added 6 changesets with 12 changes to 2 files |
|
247 | added 6 changesets with 12 changes to 2 files | |
|
248 | new changesets d57206cc072a:d8f638ac69e9 | |||
245 | updating to branch name2 |
|
249 | updating to branch name2 | |
246 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
250 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
247 | $ tstart subset2 |
|
251 | $ tstart subset2 | |
@@ -293,6 +297,7 b' Partial pull:' | |||||
293 | adding manifests |
|
297 | adding manifests | |
294 | adding file changes |
|
298 | adding file changes | |
295 | added 6 changesets with 12 changes to 2 files |
|
299 | added 6 changesets with 12 changes to 2 files | |
|
300 | new changesets d57206cc072a:d8f638ac69e9 | |||
296 | updating to branch name2 |
|
301 | updating to branch name2 | |
297 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
302 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
298 | $ cd partial |
|
303 | $ cd partial | |
@@ -318,6 +323,7 b' Partial pull:' | |||||
318 | adding manifests |
|
323 | adding manifests | |
319 | adding file changes |
|
324 | adding file changes | |
320 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
325 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
|
326 | new changesets a7892891da29:e71dbbc70e03 | |||
321 | (run 'hg heads' to see heads) |
|
327 | (run 'hg heads' to see heads) | |
322 | $ hg incoming $remote |
|
328 | $ hg incoming $remote | |
323 | comparing with http://localhost:$HGPORT/ |
|
329 | comparing with http://localhost:$HGPORT/ | |
@@ -364,6 +370,7 b' Both have new stuff in new named branche' | |||||
364 | adding manifests |
|
370 | adding manifests | |
365 | adding file changes |
|
371 | adding file changes | |
366 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
372 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
|
373 | new changesets a7892891da29:e71dbbc70e03 | |||
367 | (run 'hg heads' to see heads) |
|
374 | (run 'hg heads' to see heads) | |
368 | $ hg incoming $remote |
|
375 | $ hg incoming $remote | |
369 | comparing with http://localhost:$HGPORT/ |
|
376 | comparing with http://localhost:$HGPORT/ | |
@@ -400,6 +407,7 b' Both have new stuff in new named branche' | |||||
400 | adding manifests |
|
407 | adding manifests | |
401 | adding file changes |
|
408 | adding file changes | |
402 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
409 | added 3 changesets with 6 changes to 2 files (+1 heads) | |
|
410 | new changesets a7892891da29:e71dbbc70e03 | |||
403 | (run 'hg heads' to see heads) |
|
411 | (run 'hg heads' to see heads) | |
404 | $ hg push $remote --new-branch |
|
412 | $ hg push $remote --new-branch | |
405 | pushing to http://localhost:$HGPORT/ |
|
413 | pushing to http://localhost:$HGPORT/ | |
@@ -453,6 +461,7 b' Both have new stuff in existing named br' | |||||
453 | adding manifests |
|
461 | adding manifests | |
454 | adding file changes |
|
462 | adding file changes | |
455 | added 1 changesets with 2 changes to 2 files |
|
463 | added 1 changesets with 2 changes to 2 files | |
|
464 | new changesets d8f638ac69e9 | |||
456 | (run 'hg update' to get a working copy) |
|
465 | (run 'hg update' to get a working copy) | |
457 | $ hg incoming $remote |
|
466 | $ hg incoming $remote | |
458 | comparing with http://localhost:$HGPORT/ |
|
467 | comparing with http://localhost:$HGPORT/ | |
@@ -484,6 +493,7 b' Both have new stuff in existing named br' | |||||
484 | adding manifests |
|
493 | adding manifests | |
485 | adding file changes |
|
494 | adding file changes | |
486 | added 1 changesets with 2 changes to 2 files |
|
495 | added 1 changesets with 2 changes to 2 files | |
|
496 | new changesets d8f638ac69e9 | |||
487 | (run 'hg update' to get a working copy) |
|
497 | (run 'hg update' to get a working copy) | |
488 | $ hg push $remote --new-branch |
|
498 | $ hg push $remote --new-branch | |
489 | pushing to http://localhost:$HGPORT/ |
|
499 | pushing to http://localhost:$HGPORT/ |
@@ -232,6 +232,7 b' Create clone with tree manifests enabled' | |||||
232 | adding manifests |
|
232 | adding manifests | |
233 | adding file changes |
|
233 | adding file changes | |
234 | added 2 changesets with 14 changes to 11 files |
|
234 | added 2 changesets with 14 changes to 11 files | |
|
235 | new changesets 5b02a3e8db7e:581ef6037d8b | |||
235 | updating to branch default |
|
236 | updating to branch default | |
236 | 11 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
237 | 11 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
237 | $ cd repo-mixed |
|
238 | $ cd repo-mixed | |
@@ -342,6 +343,7 b' Stripping and recovering changes should ' | |||||
342 | adding manifests |
|
343 | adding manifests | |
343 | adding file changes |
|
344 | adding file changes | |
344 | added 1 changesets with 1 changes to 1 files |
|
345 | added 1 changesets with 1 changes to 1 files | |
|
346 | new changesets 51cfd7b1e13b | |||
345 | (run 'hg update' to get a working copy) |
|
347 | (run 'hg update' to get a working copy) | |
346 | $ hg --config extensions.strip= strip tip |
|
348 | $ hg --config extensions.strip= strip tip | |
347 | saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) |
|
349 | saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) | |
@@ -654,6 +656,7 b' We can clone even with the knob turned o' | |||||
654 | adding manifests |
|
656 | adding manifests | |
655 | adding file changes |
|
657 | adding file changes | |
656 | added 4 changesets with 18 changes to 8 files |
|
658 | added 4 changesets with 18 changes to 8 files | |
|
659 | new changesets 775704be6f52:523e5c631710 | |||
657 | updating to branch default |
|
660 | updating to branch default | |
658 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
661 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
659 | No server errors. |
|
662 | No server errors. | |
@@ -700,6 +703,7 b' Create clones using old repo formats to ' | |||||
700 | adding manifests |
|
703 | adding manifests | |
701 | adding file changes |
|
704 | adding file changes | |
702 | added 4 changesets with 18 changes to 8 files |
|
705 | added 4 changesets with 18 changes to 8 files | |
|
706 | new changesets 775704be6f52:523e5c631710 | |||
703 | updating to branch default |
|
707 | updating to branch default | |
704 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
708 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
705 | $ cd deeprepo-basicstore |
|
709 | $ cd deeprepo-basicstore | |
@@ -716,6 +720,7 b' Create clones using old repo formats to ' | |||||
716 | adding manifests |
|
720 | adding manifests | |
717 | adding file changes |
|
721 | adding file changes | |
718 | added 4 changesets with 18 changes to 8 files |
|
722 | added 4 changesets with 18 changes to 8 files | |
|
723 | new changesets 775704be6f52:523e5c631710 | |||
719 | updating to branch default |
|
724 | updating to branch default | |
720 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
725 | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
721 | $ cd deeprepo-encodedstore |
|
726 | $ cd deeprepo-encodedstore | |
@@ -845,6 +850,7 b' other branch' | |||||
845 | adding manifests |
|
850 | adding manifests | |
846 | adding file changes |
|
851 | adding file changes | |
847 | added 2 changesets with 3 changes to 2 files |
|
852 | added 2 changesets with 3 changes to 2 files | |
|
853 | new changesets d84f4c419457:09ab742f3b0f | |||
848 | updating to branch default |
|
854 | updating to branch default | |
849 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
855 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
850 | $ cd grafted-dir-repo-clone |
|
856 | $ cd grafted-dir-repo-clone | |
@@ -855,6 +861,7 b' other branch' | |||||
855 | adding manifests |
|
861 | adding manifests | |
856 | adding file changes |
|
862 | adding file changes | |
857 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
863 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
864 | new changesets 73699489fb7c | |||
858 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
865 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
859 |
|
866 | |||
860 | Committing a empty commit does not duplicate root treemanifest |
|
867 | Committing a empty commit does not duplicate root treemanifest |
@@ -126,6 +126,7 b' union repos can be cloned ... and clones' | |||||
126 | adding manifests |
|
126 | adding manifests | |
127 | adding file changes |
|
127 | adding file changes | |
128 | added 6 changesets with 11 changes to 6 files (+1 heads) |
|
128 | added 6 changesets with 11 changes to 6 files (+1 heads) | |
|
129 | new changesets f093fec0529b:2f0d178c469c | |||
129 |
|
130 | |||
130 | $ hg -R repo3 paths |
|
131 | $ hg -R repo3 paths | |
131 | default = union:repo1+repo2 |
|
132 | default = union:repo1+repo2 |
@@ -26,6 +26,7 b'' | |||||
26 | adding manifests |
|
26 | adding manifests | |
27 | adding file changes |
|
27 | adding file changes | |
28 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
28 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
29 | new changesets 9a79c33a9db3 | |||
29 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
30 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
30 |
|
31 | |||
31 | $ hg heads |
|
32 | $ hg heads |
@@ -224,6 +224,7 b' test a local add' | |||||
224 | adding manifests |
|
224 | adding manifests | |
225 | adding file changes |
|
225 | adding file changes | |
226 | added 1 changesets with 1 changes to 1 files |
|
226 | added 1 changesets with 1 changes to 1 files | |
|
227 | new changesets cb9a9f314b8b | |||
227 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
228 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
228 | $ hg st |
|
229 | $ hg st | |
229 |
|
230 |
@@ -46,3 +46,4 b' update.requiredest should silent the "hg' | |||||
46 | adding manifests |
|
46 | adding manifests | |
47 | adding file changes |
|
47 | adding file changes | |
48 | added 2 changesets with 2 changes to 1 files |
|
48 | added 2 changesets with 2 changes to 1 files | |
|
49 | new changesets 8f0162e483d0:048c2cb95949 |
@@ -16,6 +16,7 b' Test basic functionality of url#rev synt' | |||||
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 2 changesets with 2 changes to 1 files |
|
18 | added 2 changesets with 2 changes to 1 files | |
|
19 | new changesets 1f0dee641bb7:cd2a86ecc814 | |||
19 | updating to branch foo |
|
20 | updating to branch foo | |
20 | 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 | |
21 |
|
22 |
General Comments 0
You need to be logged in to leave comments.
Login now