Show More
@@ -1,126 +1,131 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | cp "$TESTDIR"/printenv.py . |
|
3 | cp "$TESTDIR"/printenv.py . | |
4 |
|
4 | |||
5 | echo "====== Setting up test" |
|
5 | echo "====== Setting up test" | |
6 | hg init test |
|
6 | hg init test | |
7 | cd test |
|
7 | cd test | |
8 | echo 0 > afile |
|
8 | echo 0 > afile | |
9 | hg add afile |
|
9 | hg add afile | |
10 | hg commit -m "0.0" -d "1000000 0" |
|
10 | hg commit -m "0.0" -d "1000000 0" | |
11 | echo 1 >> afile |
|
11 | echo 1 >> afile | |
12 | hg commit -m "0.1" -d "1000000 0" |
|
12 | hg commit -m "0.1" -d "1000000 0" | |
13 | echo 2 >> afile |
|
13 | echo 2 >> afile | |
14 | hg commit -m "0.2" -d "1000000 0" |
|
14 | hg commit -m "0.2" -d "1000000 0" | |
15 | echo 3 >> afile |
|
15 | echo 3 >> afile | |
16 | hg commit -m "0.3" -d "1000000 0" |
|
16 | hg commit -m "0.3" -d "1000000 0" | |
17 | hg update -C 0 |
|
17 | hg update -C 0 | |
18 | echo 1 >> afile |
|
18 | echo 1 >> afile | |
19 | hg commit -m "1.1" -d "1000000 0" |
|
19 | hg commit -m "1.1" -d "1000000 0" | |
20 | echo 2 >> afile |
|
20 | echo 2 >> afile | |
21 | hg commit -m "1.2" -d "1000000 0" |
|
21 | hg commit -m "1.2" -d "1000000 0" | |
22 | echo "a line" > fred |
|
22 | echo "a line" > fred | |
23 | echo 3 >> afile |
|
23 | echo 3 >> afile | |
24 | hg add fred |
|
24 | hg add fred | |
25 | hg commit -m "1.3" -d "1000000 0" |
|
25 | hg commit -m "1.3" -d "1000000 0" | |
26 | hg mv afile adifferentfile |
|
26 | hg mv afile adifferentfile | |
27 | hg commit -m "1.3m" -d "1000000 0" |
|
27 | hg commit -m "1.3m" -d "1000000 0" | |
28 | hg update -C 3 |
|
28 | hg update -C 3 | |
29 | hg mv afile anotherfile |
|
29 | hg mv afile anotherfile | |
30 | hg commit -m "0.3m" -d "1000000 0" |
|
30 | hg commit -m "0.3m" -d "1000000 0" | |
31 | hg verify |
|
31 | hg verify | |
32 | cd .. |
|
32 | cd .. | |
33 | hg init empty |
|
33 | hg init empty | |
34 |
|
34 | |||
35 | echo "====== Bundle --all" |
|
35 | echo "====== Bundle --all" | |
36 | hg -R test bundle --all all.hg |
|
36 | hg -R test bundle --all all.hg | |
37 | echo "====== Bundle test to full.hg" |
|
37 | echo "====== Bundle test to full.hg" | |
38 | hg -R test bundle full.hg empty |
|
38 | hg -R test bundle full.hg empty | |
39 | echo "====== Unbundle full.hg in test" |
|
39 | echo "====== Unbundle full.hg in test" | |
40 | hg -R test unbundle full.hg |
|
40 | hg -R test unbundle full.hg | |
41 | echo "====== Verify empty" |
|
41 | echo "====== Verify empty" | |
42 | hg -R empty heads |
|
42 | hg -R empty heads | |
43 | hg -R empty verify |
|
43 | hg -R empty verify | |
44 |
|
44 | |||
45 | echo "====== Pull full.hg into test (using --cwd)" |
|
45 | echo "====== Pull full.hg into test (using --cwd)" | |
46 | hg --cwd test pull ../full.hg |
|
46 | hg --cwd test pull ../full.hg | |
47 | echo "====== Pull full.hg into empty (using --cwd)" |
|
47 | echo "====== Pull full.hg into empty (using --cwd)" | |
48 | hg --cwd empty pull ../full.hg |
|
48 | hg --cwd empty pull ../full.hg | |
49 | echo "====== Rollback empty" |
|
49 | echo "====== Rollback empty" | |
50 | hg -R empty rollback |
|
50 | hg -R empty rollback | |
51 | echo "====== Pull full.hg into empty again (using --cwd)" |
|
51 | echo "====== Pull full.hg into empty again (using --cwd)" | |
52 | hg --cwd empty pull ../full.hg |
|
52 | hg --cwd empty pull ../full.hg | |
53 |
|
53 | |||
54 | echo "====== Pull full.hg into test (using -R)" |
|
54 | echo "====== Pull full.hg into test (using -R)" | |
55 | hg -R test pull full.hg |
|
55 | hg -R test pull full.hg | |
56 | echo "====== Pull full.hg into empty (using -R)" |
|
56 | echo "====== Pull full.hg into empty (using -R)" | |
57 | hg -R empty pull full.hg |
|
57 | hg -R empty pull full.hg | |
58 | echo "====== Rollback empty" |
|
58 | echo "====== Rollback empty" | |
59 | hg -R empty rollback |
|
59 | hg -R empty rollback | |
60 | echo "====== Pull full.hg into empty again (using -R)" |
|
60 | echo "====== Pull full.hg into empty again (using -R)" | |
61 | hg -R empty pull full.hg |
|
61 | hg -R empty pull full.hg | |
62 |
|
62 | |||
63 | echo "====== Log -R full.hg in fresh empty" |
|
63 | echo "====== Log -R full.hg in fresh empty" | |
64 | rm -r empty |
|
64 | rm -r empty | |
65 | hg init empty |
|
65 | hg init empty | |
66 | cd empty |
|
66 | cd empty | |
67 | hg -R bundle://../full.hg log |
|
67 | hg -R bundle://../full.hg log | |
68 |
|
68 | |||
69 | echo "====== Pull ../full.hg into empty (with hook)" |
|
69 | echo "====== Pull ../full.hg into empty (with hook)" | |
70 | echo '[hooks]' >> .hg/hgrc |
|
70 | echo '[hooks]' >> .hg/hgrc | |
71 | echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc |
|
71 | echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc | |
72 | #doesn't work (yet ?) |
|
72 | #doesn't work (yet ?) | |
73 | #hg -R bundle://../full.hg verify |
|
73 | #hg -R bundle://../full.hg verify | |
74 | hg pull bundle://../full.hg |
|
74 | hg pull bundle://../full.hg | |
75 | echo "====== Rollback empty" |
|
75 | echo "====== Rollback empty" | |
76 | hg rollback |
|
76 | hg rollback | |
77 | cd .. |
|
77 | cd .. | |
78 | echo "====== Log -R bundle:empty+full.hg" |
|
78 | echo "====== Log -R bundle:empty+full.hg" | |
79 | hg -R bundle:empty+full.hg log --template="{rev} " |
|
79 | hg -R bundle:empty+full.hg log --template="{rev} " | |
80 | echo "" |
|
80 | echo "" | |
81 | echo "====== Pull full.hg into empty again (using -R; with hook)" |
|
81 | echo "====== Pull full.hg into empty again (using -R; with hook)" | |
82 | hg -R empty pull full.hg |
|
82 | hg -R empty pull full.hg | |
83 |
|
83 | |||
84 | echo "====== Create partial clones" |
|
84 | echo "====== Create partial clones" | |
85 | rm -r empty |
|
85 | rm -r empty | |
86 | hg init empty |
|
86 | hg init empty | |
87 | hg clone -r 3 test partial |
|
87 | hg clone -r 3 test partial | |
88 | hg clone partial partial2 |
|
88 | hg clone partial partial2 | |
89 | cd partial |
|
89 | cd partial | |
90 | echo "====== Log -R full.hg in partial" |
|
90 | echo "====== Log -R full.hg in partial" | |
91 | hg -R bundle://../full.hg log |
|
91 | hg -R bundle://../full.hg log | |
92 | echo "====== Incoming full.hg in partial" |
|
92 | echo "====== Incoming full.hg in partial" | |
93 | hg incoming bundle://../full.hg |
|
93 | hg incoming bundle://../full.hg | |
94 | echo "====== Outgoing -R full.hg vs partial2 in partial" |
|
94 | echo "====== Outgoing -R full.hg vs partial2 in partial" | |
95 | hg -R bundle://../full.hg outgoing ../partial2 |
|
95 | hg -R bundle://../full.hg outgoing ../partial2 | |
96 | echo "====== Outgoing -R does-not-exist.hg vs partial2 in partial" |
|
96 | echo "====== Outgoing -R does-not-exist.hg vs partial2 in partial" | |
97 | hg -R bundle://../does-not-exist.hg outgoing ../partial2 |
|
97 | hg -R bundle://../does-not-exist.hg outgoing ../partial2 | |
98 | cd .. |
|
98 | cd .. | |
99 |
|
99 | |||
|
100 | echo "====== Direct clone from bundle (all-history)" | |||
|
101 | hg clone full.hg full-clone | |||
|
102 | hg -R full-clone heads | |||
|
103 | rm -r full-clone | |||
|
104 | ||||
100 | # test for http://www.selenic.com/mercurial/bts/issue216 |
|
105 | # test for http://www.selenic.com/mercurial/bts/issue216 | |
101 | echo "====== Unbundle incremental bundles into fresh empty in one go" |
|
106 | echo "====== Unbundle incremental bundles into fresh empty in one go" | |
102 | rm -r empty |
|
107 | rm -r empty | |
103 | hg init empty |
|
108 | hg init empty | |
104 | hg -R test bundle --base null -r 0 ../0.hg |
|
109 | hg -R test bundle --base null -r 0 ../0.hg | |
105 | hg -R test bundle --base 0 -r 1 ../1.hg |
|
110 | hg -R test bundle --base 0 -r 1 ../1.hg | |
106 | hg -R empty unbundle -u ../0.hg ../1.hg |
|
111 | hg -R empty unbundle -u ../0.hg ../1.hg | |
107 |
|
112 | |||
108 | # test for 540d1059c802 |
|
113 | # test for 540d1059c802 | |
109 | echo "====== test for 540d1059c802" |
|
114 | echo "====== test for 540d1059c802" | |
110 | hg init orig |
|
115 | hg init orig | |
111 | cd orig |
|
116 | cd orig | |
112 | echo foo > foo |
|
117 | echo foo > foo | |
113 | hg add foo |
|
118 | hg add foo | |
114 | hg ci -m 'add foo' -d '0 0' |
|
119 | hg ci -m 'add foo' -d '0 0' | |
115 |
|
120 | |||
116 | hg clone . ../copy |
|
121 | hg clone . ../copy | |
117 | hg tag -d '0 0' foo |
|
122 | hg tag -d '0 0' foo | |
118 |
|
123 | |||
119 | cd ../copy |
|
124 | cd ../copy | |
120 | echo >> foo |
|
125 | echo >> foo | |
121 | hg ci -m 'change foo' -d '0 0' |
|
126 | hg ci -m 'change foo' -d '0 0' | |
122 | hg bundle ../bundle.hg ../orig |
|
127 | hg bundle ../bundle.hg ../orig | |
123 |
|
128 | |||
124 | cd ../orig |
|
129 | cd ../orig | |
125 | hg incoming ../bundle.hg |
|
130 | hg incoming ../bundle.hg | |
126 | cd .. |
|
131 | cd .. |
@@ -1,287 +1,306 b'' | |||||
1 | ====== Setting up test |
|
1 | ====== Setting up test | |
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
4 | checking changesets |
|
4 | checking changesets | |
5 | checking manifests |
|
5 | checking manifests | |
6 | crosschecking files in changesets and manifests |
|
6 | crosschecking files in changesets and manifests | |
7 | checking files |
|
7 | checking files | |
8 | 4 files, 9 changesets, 7 total revisions |
|
8 | 4 files, 9 changesets, 7 total revisions | |
9 | ====== Bundle --all |
|
9 | ====== Bundle --all | |
10 | 9 changesets found |
|
10 | 9 changesets found | |
11 | ====== Bundle test to full.hg |
|
11 | ====== Bundle test to full.hg | |
12 | searching for changes |
|
12 | searching for changes | |
13 | 9 changesets found |
|
13 | 9 changesets found | |
14 | ====== Unbundle full.hg in test |
|
14 | ====== Unbundle full.hg in test | |
15 | adding changesets |
|
15 | adding changesets | |
16 | adding manifests |
|
16 | adding manifests | |
17 | adding file changes |
|
17 | adding file changes | |
18 | added 0 changesets with 0 changes to 4 files |
|
18 | added 0 changesets with 0 changes to 4 files | |
19 | (run 'hg update' to get a working copy) |
|
19 | (run 'hg update' to get a working copy) | |
20 | ====== Verify empty |
|
20 | ====== Verify empty | |
21 | changeset: -1:000000000000 |
|
21 | changeset: -1:000000000000 | |
22 | tag: tip |
|
22 | tag: tip | |
23 | user: |
|
23 | user: | |
24 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
24 | date: Thu Jan 01 00:00:00 1970 +0000 | |
25 |
|
25 | |||
26 | checking changesets |
|
26 | checking changesets | |
27 | checking manifests |
|
27 | checking manifests | |
28 | crosschecking files in changesets and manifests |
|
28 | crosschecking files in changesets and manifests | |
29 | checking files |
|
29 | checking files | |
30 | 0 files, 0 changesets, 0 total revisions |
|
30 | 0 files, 0 changesets, 0 total revisions | |
31 | ====== Pull full.hg into test (using --cwd) |
|
31 | ====== Pull full.hg into test (using --cwd) | |
32 | pulling from ../full.hg |
|
32 | pulling from ../full.hg | |
33 | searching for changes |
|
33 | searching for changes | |
34 | no changes found |
|
34 | no changes found | |
35 | ====== Pull full.hg into empty (using --cwd) |
|
35 | ====== Pull full.hg into empty (using --cwd) | |
36 | pulling from ../full.hg |
|
36 | pulling from ../full.hg | |
37 | requesting all changes |
|
37 | requesting all changes | |
38 | adding changesets |
|
38 | adding changesets | |
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
41 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
42 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
42 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
43 | ====== Rollback empty |
|
43 | ====== Rollback empty | |
44 | rolling back last transaction |
|
44 | rolling back last transaction | |
45 | ====== Pull full.hg into empty again (using --cwd) |
|
45 | ====== Pull full.hg into empty again (using --cwd) | |
46 | pulling from ../full.hg |
|
46 | pulling from ../full.hg | |
47 | requesting all changes |
|
47 | requesting all changes | |
48 | adding changesets |
|
48 | adding changesets | |
49 | adding manifests |
|
49 | adding manifests | |
50 | adding file changes |
|
50 | adding file changes | |
51 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
51 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
52 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
52 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
53 | ====== Pull full.hg into test (using -R) |
|
53 | ====== Pull full.hg into test (using -R) | |
54 | pulling from full.hg |
|
54 | pulling from full.hg | |
55 | searching for changes |
|
55 | searching for changes | |
56 | no changes found |
|
56 | no changes found | |
57 | ====== Pull full.hg into empty (using -R) |
|
57 | ====== Pull full.hg into empty (using -R) | |
58 | pulling from full.hg |
|
58 | pulling from full.hg | |
59 | searching for changes |
|
59 | searching for changes | |
60 | no changes found |
|
60 | no changes found | |
61 | ====== Rollback empty |
|
61 | ====== Rollback empty | |
62 | rolling back last transaction |
|
62 | rolling back last transaction | |
63 | ====== Pull full.hg into empty again (using -R) |
|
63 | ====== Pull full.hg into empty again (using -R) | |
64 | pulling from full.hg |
|
64 | pulling from full.hg | |
65 | requesting all changes |
|
65 | requesting all changes | |
66 | adding changesets |
|
66 | adding changesets | |
67 | adding manifests |
|
67 | adding manifests | |
68 | adding file changes |
|
68 | adding file changes | |
69 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
69 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
70 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
70 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
71 | ====== Log -R full.hg in fresh empty |
|
71 | ====== Log -R full.hg in fresh empty | |
72 | changeset: 8:836ac62537ab |
|
72 | changeset: 8:836ac62537ab | |
73 | tag: tip |
|
73 | tag: tip | |
74 | parent: 3:ac69c658229d |
|
74 | parent: 3:ac69c658229d | |
75 | user: test |
|
75 | user: test | |
76 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
76 | date: Mon Jan 12 13:46:40 1970 +0000 | |
77 | summary: 0.3m |
|
77 | summary: 0.3m | |
78 |
|
78 | |||
79 | changeset: 7:80fe151401c2 |
|
79 | changeset: 7:80fe151401c2 | |
80 | user: test |
|
80 | user: test | |
81 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
81 | date: Mon Jan 12 13:46:40 1970 +0000 | |
82 | summary: 1.3m |
|
82 | summary: 1.3m | |
83 |
|
83 | |||
84 | changeset: 6:1e3f6b843bd6 |
|
84 | changeset: 6:1e3f6b843bd6 | |
85 | user: test |
|
85 | user: test | |
86 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
86 | date: Mon Jan 12 13:46:40 1970 +0000 | |
87 | summary: 1.3 |
|
87 | summary: 1.3 | |
88 |
|
88 | |||
89 | changeset: 5:024e4e7df376 |
|
89 | changeset: 5:024e4e7df376 | |
90 | user: test |
|
90 | user: test | |
91 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
91 | date: Mon Jan 12 13:46:40 1970 +0000 | |
92 | summary: 1.2 |
|
92 | summary: 1.2 | |
93 |
|
93 | |||
94 | changeset: 4:5f4f3ceb285e |
|
94 | changeset: 4:5f4f3ceb285e | |
95 | parent: 0:5649c9d34dd8 |
|
95 | parent: 0:5649c9d34dd8 | |
96 | user: test |
|
96 | user: test | |
97 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
97 | date: Mon Jan 12 13:46:40 1970 +0000 | |
98 | summary: 1.1 |
|
98 | summary: 1.1 | |
99 |
|
99 | |||
100 | changeset: 3:ac69c658229d |
|
100 | changeset: 3:ac69c658229d | |
101 | user: test |
|
101 | user: test | |
102 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
102 | date: Mon Jan 12 13:46:40 1970 +0000 | |
103 | summary: 0.3 |
|
103 | summary: 0.3 | |
104 |
|
104 | |||
105 | changeset: 2:d62976ca1e50 |
|
105 | changeset: 2:d62976ca1e50 | |
106 | user: test |
|
106 | user: test | |
107 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
107 | date: Mon Jan 12 13:46:40 1970 +0000 | |
108 | summary: 0.2 |
|
108 | summary: 0.2 | |
109 |
|
109 | |||
110 | changeset: 1:10b2180f755b |
|
110 | changeset: 1:10b2180f755b | |
111 | user: test |
|
111 | user: test | |
112 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
112 | date: Mon Jan 12 13:46:40 1970 +0000 | |
113 | summary: 0.1 |
|
113 | summary: 0.1 | |
114 |
|
114 | |||
115 | changeset: 0:5649c9d34dd8 |
|
115 | changeset: 0:5649c9d34dd8 | |
116 | user: test |
|
116 | user: test | |
117 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
117 | date: Mon Jan 12 13:46:40 1970 +0000 | |
118 | summary: 0.0 |
|
118 | summary: 0.0 | |
119 |
|
119 | |||
120 | ====== Pull ../full.hg into empty (with hook) |
|
120 | ====== Pull ../full.hg into empty (with hook) | |
121 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg |
|
121 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg | |
122 | pulling from bundle://../full.hg |
|
122 | pulling from bundle://../full.hg | |
123 | requesting all changes |
|
123 | requesting all changes | |
124 | adding changesets |
|
124 | adding changesets | |
125 | adding manifests |
|
125 | adding manifests | |
126 | adding file changes |
|
126 | adding file changes | |
127 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
127 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
128 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
128 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
129 | ====== Rollback empty |
|
129 | ====== Rollback empty | |
130 | rolling back last transaction |
|
130 | rolling back last transaction | |
131 | ====== Log -R bundle:empty+full.hg |
|
131 | ====== Log -R bundle:empty+full.hg | |
132 | 8 7 6 5 4 3 2 1 0 |
|
132 | 8 7 6 5 4 3 2 1 0 | |
133 | ====== Pull full.hg into empty again (using -R; with hook) |
|
133 | ====== Pull full.hg into empty again (using -R; with hook) | |
134 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg |
|
134 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg | |
135 | pulling from full.hg |
|
135 | pulling from full.hg | |
136 | requesting all changes |
|
136 | requesting all changes | |
137 | adding changesets |
|
137 | adding changesets | |
138 | adding manifests |
|
138 | adding manifests | |
139 | adding file changes |
|
139 | adding file changes | |
140 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
140 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
141 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
141 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
142 | ====== Create partial clones |
|
142 | ====== Create partial clones | |
143 | requesting all changes |
|
143 | requesting all changes | |
144 | adding changesets |
|
144 | adding changesets | |
145 | adding manifests |
|
145 | adding manifests | |
146 | adding file changes |
|
146 | adding file changes | |
147 | added 4 changesets with 4 changes to 1 files |
|
147 | added 4 changesets with 4 changes to 1 files | |
148 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
148 | 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 |
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
150 | ====== Log -R full.hg in partial |
|
150 | ====== Log -R full.hg in partial | |
151 | changeset: 8:836ac62537ab |
|
151 | changeset: 8:836ac62537ab | |
152 | tag: tip |
|
152 | tag: tip | |
153 | parent: 3:ac69c658229d |
|
153 | parent: 3:ac69c658229d | |
154 | user: test |
|
154 | user: test | |
155 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
155 | date: Mon Jan 12 13:46:40 1970 +0000 | |
156 | summary: 0.3m |
|
156 | summary: 0.3m | |
157 |
|
157 | |||
158 | changeset: 7:80fe151401c2 |
|
158 | changeset: 7:80fe151401c2 | |
159 | user: test |
|
159 | user: test | |
160 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
160 | date: Mon Jan 12 13:46:40 1970 +0000 | |
161 | summary: 1.3m |
|
161 | summary: 1.3m | |
162 |
|
162 | |||
163 | changeset: 6:1e3f6b843bd6 |
|
163 | changeset: 6:1e3f6b843bd6 | |
164 | user: test |
|
164 | user: test | |
165 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
165 | date: Mon Jan 12 13:46:40 1970 +0000 | |
166 | summary: 1.3 |
|
166 | summary: 1.3 | |
167 |
|
167 | |||
168 | changeset: 5:024e4e7df376 |
|
168 | changeset: 5:024e4e7df376 | |
169 | user: test |
|
169 | user: test | |
170 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
170 | date: Mon Jan 12 13:46:40 1970 +0000 | |
171 | summary: 1.2 |
|
171 | summary: 1.2 | |
172 |
|
172 | |||
173 | changeset: 4:5f4f3ceb285e |
|
173 | changeset: 4:5f4f3ceb285e | |
174 | parent: 0:5649c9d34dd8 |
|
174 | parent: 0:5649c9d34dd8 | |
175 | user: test |
|
175 | user: test | |
176 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
176 | date: Mon Jan 12 13:46:40 1970 +0000 | |
177 | summary: 1.1 |
|
177 | summary: 1.1 | |
178 |
|
178 | |||
179 | changeset: 3:ac69c658229d |
|
179 | changeset: 3:ac69c658229d | |
180 | user: test |
|
180 | user: test | |
181 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
181 | date: Mon Jan 12 13:46:40 1970 +0000 | |
182 | summary: 0.3 |
|
182 | summary: 0.3 | |
183 |
|
183 | |||
184 | changeset: 2:d62976ca1e50 |
|
184 | changeset: 2:d62976ca1e50 | |
185 | user: test |
|
185 | user: test | |
186 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
186 | date: Mon Jan 12 13:46:40 1970 +0000 | |
187 | summary: 0.2 |
|
187 | summary: 0.2 | |
188 |
|
188 | |||
189 | changeset: 1:10b2180f755b |
|
189 | changeset: 1:10b2180f755b | |
190 | user: test |
|
190 | user: test | |
191 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
191 | date: Mon Jan 12 13:46:40 1970 +0000 | |
192 | summary: 0.1 |
|
192 | summary: 0.1 | |
193 |
|
193 | |||
194 | changeset: 0:5649c9d34dd8 |
|
194 | changeset: 0:5649c9d34dd8 | |
195 | user: test |
|
195 | user: test | |
196 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
196 | date: Mon Jan 12 13:46:40 1970 +0000 | |
197 | summary: 0.0 |
|
197 | summary: 0.0 | |
198 |
|
198 | |||
199 | ====== Incoming full.hg in partial |
|
199 | ====== Incoming full.hg in partial | |
200 | comparing with bundle://../full.hg |
|
200 | comparing with bundle://../full.hg | |
201 | searching for changes |
|
201 | searching for changes | |
202 | changeset: 4:5f4f3ceb285e |
|
202 | changeset: 4:5f4f3ceb285e | |
203 | parent: 0:5649c9d34dd8 |
|
203 | parent: 0:5649c9d34dd8 | |
204 | user: test |
|
204 | user: test | |
205 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
205 | date: Mon Jan 12 13:46:40 1970 +0000 | |
206 | summary: 1.1 |
|
206 | summary: 1.1 | |
207 |
|
207 | |||
208 | changeset: 5:024e4e7df376 |
|
208 | changeset: 5:024e4e7df376 | |
209 | user: test |
|
209 | user: test | |
210 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
210 | date: Mon Jan 12 13:46:40 1970 +0000 | |
211 | summary: 1.2 |
|
211 | summary: 1.2 | |
212 |
|
212 | |||
213 | changeset: 6:1e3f6b843bd6 |
|
213 | changeset: 6:1e3f6b843bd6 | |
214 | user: test |
|
214 | user: test | |
215 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
215 | date: Mon Jan 12 13:46:40 1970 +0000 | |
216 | summary: 1.3 |
|
216 | summary: 1.3 | |
217 |
|
217 | |||
218 | changeset: 7:80fe151401c2 |
|
218 | changeset: 7:80fe151401c2 | |
219 | user: test |
|
219 | user: test | |
220 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
220 | date: Mon Jan 12 13:46:40 1970 +0000 | |
221 | summary: 1.3m |
|
221 | summary: 1.3m | |
222 |
|
222 | |||
223 | changeset: 8:836ac62537ab |
|
223 | changeset: 8:836ac62537ab | |
224 | tag: tip |
|
224 | tag: tip | |
225 | parent: 3:ac69c658229d |
|
225 | parent: 3:ac69c658229d | |
226 | user: test |
|
226 | user: test | |
227 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
227 | date: Mon Jan 12 13:46:40 1970 +0000 | |
228 | summary: 0.3m |
|
228 | summary: 0.3m | |
229 |
|
229 | |||
230 | ====== Outgoing -R full.hg vs partial2 in partial |
|
230 | ====== Outgoing -R full.hg vs partial2 in partial | |
231 | comparing with ../partial2 |
|
231 | comparing with ../partial2 | |
232 | searching for changes |
|
232 | searching for changes | |
233 | changeset: 4:5f4f3ceb285e |
|
233 | changeset: 4:5f4f3ceb285e | |
234 | parent: 0:5649c9d34dd8 |
|
234 | parent: 0:5649c9d34dd8 | |
235 | user: test |
|
235 | user: test | |
236 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
236 | date: Mon Jan 12 13:46:40 1970 +0000 | |
237 | summary: 1.1 |
|
237 | summary: 1.1 | |
238 |
|
238 | |||
239 | changeset: 5:024e4e7df376 |
|
239 | changeset: 5:024e4e7df376 | |
240 | user: test |
|
240 | user: test | |
241 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
241 | date: Mon Jan 12 13:46:40 1970 +0000 | |
242 | summary: 1.2 |
|
242 | summary: 1.2 | |
243 |
|
243 | |||
244 | changeset: 6:1e3f6b843bd6 |
|
244 | changeset: 6:1e3f6b843bd6 | |
245 | user: test |
|
245 | user: test | |
246 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
246 | date: Mon Jan 12 13:46:40 1970 +0000 | |
247 | summary: 1.3 |
|
247 | summary: 1.3 | |
248 |
|
248 | |||
249 | changeset: 7:80fe151401c2 |
|
249 | changeset: 7:80fe151401c2 | |
250 | user: test |
|
250 | user: test | |
251 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
251 | date: Mon Jan 12 13:46:40 1970 +0000 | |
252 | summary: 1.3m |
|
252 | summary: 1.3m | |
253 |
|
253 | |||
254 | changeset: 8:836ac62537ab |
|
254 | changeset: 8:836ac62537ab | |
255 | tag: tip |
|
255 | tag: tip | |
256 | parent: 3:ac69c658229d |
|
256 | parent: 3:ac69c658229d | |
257 | user: test |
|
257 | user: test | |
258 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
258 | date: Mon Jan 12 13:46:40 1970 +0000 | |
259 | summary: 0.3m |
|
259 | summary: 0.3m | |
260 |
|
260 | |||
261 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial |
|
261 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial | |
262 | abort: No such file or directory: ../does-not-exist.hg |
|
262 | abort: No such file or directory: ../does-not-exist.hg | |
|
263 | ====== Direct clone from bundle (all-history) | |||
|
264 | requesting all changes | |||
|
265 | adding changesets | |||
|
266 | adding manifests | |||
|
267 | adding file changes | |||
|
268 | added 9 changesets with 7 changes to 4 files (+1 heads) | |||
|
269 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
270 | changeset: 8:836ac62537ab | |||
|
271 | tag: tip | |||
|
272 | parent: 3:ac69c658229d | |||
|
273 | user: test | |||
|
274 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
275 | summary: 0.3m | |||
|
276 | ||||
|
277 | changeset: 7:80fe151401c2 | |||
|
278 | user: test | |||
|
279 | date: Mon Jan 12 13:46:40 1970 +0000 | |||
|
280 | summary: 1.3m | |||
|
281 | ||||
263 | ====== Unbundle incremental bundles into fresh empty in one go |
|
282 | ====== Unbundle incremental bundles into fresh empty in one go | |
264 | 1 changesets found |
|
283 | 1 changesets found | |
265 | 1 changesets found |
|
284 | 1 changesets found | |
266 | adding changesets |
|
285 | adding changesets | |
267 | adding manifests |
|
286 | adding manifests | |
268 | adding file changes |
|
287 | adding file changes | |
269 | added 1 changesets with 1 changes to 1 files |
|
288 | added 1 changesets with 1 changes to 1 files | |
270 | adding changesets |
|
289 | adding changesets | |
271 | adding manifests |
|
290 | adding manifests | |
272 | adding file changes |
|
291 | adding file changes | |
273 | added 1 changesets with 1 changes to 1 files |
|
292 | added 1 changesets with 1 changes to 1 files | |
274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
293 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
275 | ====== test for 540d1059c802 |
|
294 | ====== test for 540d1059c802 | |
276 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
277 | searching for changes |
|
296 | searching for changes | |
278 | 1 changesets found |
|
297 | 1 changesets found | |
279 | comparing with ../bundle.hg |
|
298 | comparing with ../bundle.hg | |
280 | searching for changes |
|
299 | searching for changes | |
281 | changeset: 2:ed1b79f46b9a |
|
300 | changeset: 2:ed1b79f46b9a | |
282 | tag: tip |
|
301 | tag: tip | |
283 | parent: 0:bbd179dfa0a7 |
|
302 | parent: 0:bbd179dfa0a7 | |
284 | user: test |
|
303 | user: test | |
285 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 | date: Thu Jan 01 00:00:00 1970 +0000 | |
286 | summary: change foo |
|
305 | summary: change foo | |
287 |
|
306 |
General Comments 0
You need to be logged in to leave comments.
Login now