##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Adjusted output of test-subrepo for issue1977 to 05856e682521
Thomas Arendsen Hein -
r11086:c2601c21 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,231 +1,231
1 #!/bin/sh
1 #!/bin/sh
2
2
3 rm -rf sub
3 rm -rf sub
4 mkdir sub
4 mkdir sub
5 cd sub
5 cd sub
6 hg init t
6 hg init t
7 cd t
7 cd t
8
8
9 echo % first revision, no sub
9 echo % first revision, no sub
10 echo a > a
10 echo a > a
11 hg ci -Am0
11 hg ci -Am0
12
12
13 echo % add first sub
13 echo % add first sub
14 echo s = s > .hgsub
14 echo s = s > .hgsub
15 hg add .hgsub
15 hg add .hgsub
16 hg init s
16 hg init s
17 echo a > s/a
17 echo a > s/a
18 hg -R s ci -Ams0
18 hg -R s ci -Ams0
19 hg ci -m1
19 hg ci -m1
20
20
21 echo % add sub sub
21 echo % add sub sub
22 echo ss = ss > s/.hgsub
22 echo ss = ss > s/.hgsub
23 hg init s/ss
23 hg init s/ss
24 echo a > s/ss/a
24 echo a > s/ss/a
25 hg -R s add s/.hgsub
25 hg -R s add s/.hgsub
26 hg -R s/ss add s/ss/a
26 hg -R s/ss add s/ss/a
27 hg ci -m2
27 hg ci -m2
28
28
29 echo % bump sub rev
29 echo % bump sub rev
30 echo b > s/a
30 echo b > s/a
31 hg -R s ci -ms1
31 hg -R s ci -ms1
32 hg ci -m3
32 hg ci -m3
33
33
34 echo % leave sub dirty
34 echo % leave sub dirty
35 echo c > s/a
35 echo c > s/a
36 hg ci -m4
36 hg ci -m4
37 hg tip -R s
37 hg tip -R s
38
38
39 echo % check caching
39 echo % check caching
40 hg co 0
40 hg co 0
41 hg debugsub
41 hg debugsub
42 echo % restore
42 echo % restore
43 hg co
43 hg co
44 hg debugsub
44 hg debugsub
45
45
46 echo % new branch for merge tests
46 echo % new branch for merge tests
47 hg co 1
47 hg co 1
48 echo t = t >> .hgsub
48 echo t = t >> .hgsub
49 hg init t
49 hg init t
50 echo t > t/t
50 echo t > t/t
51 hg -R t add t
51 hg -R t add t
52 echo % 5
52 echo % 5
53 hg ci -m5 # add sub
53 hg ci -m5 # add sub
54 echo t2 > t/t
54 echo t2 > t/t
55 echo % 6
55 echo % 6
56 hg st -R s
56 hg st -R s
57 hg ci -m6 # change sub
57 hg ci -m6 # change sub
58 hg debugsub
58 hg debugsub
59 echo t3 > t/t
59 echo t3 > t/t
60 echo % 7
60 echo % 7
61 hg ci -m7 # change sub again for conflict test
61 hg ci -m7 # change sub again for conflict test
62 hg rm .hgsub
62 hg rm .hgsub
63 echo % 8
63 echo % 8
64 hg ci -m8 # remove sub
64 hg ci -m8 # remove sub
65
65
66 echo % merge tests
66 echo % merge tests
67 hg co -C 3
67 hg co -C 3
68 hg merge 5 # test adding
68 hg merge 5 # test adding
69 hg debugsub
69 hg debugsub
70 hg ci -m9
70 hg ci -m9
71 hg merge 6 --debug # test change
71 hg merge 6 --debug # test change
72 hg debugsub
72 hg debugsub
73 echo conflict > t/t
73 echo conflict > t/t
74 hg ci -m10
74 hg ci -m10
75 HGMERGE=internal:merge hg merge --debug 7 # test conflict
75 HGMERGE=internal:merge hg merge --debug 7 # test conflict
76 echo % should conflict
76 echo % should conflict
77 cat t/t
77 cat t/t
78
78
79 echo % clone
79 echo % clone
80 cd ..
80 cd ..
81 hg clone t tc | sed 's|from .*/sub|from .../sub|g'
81 hg clone t tc | sed 's|from .*/sub|from .../sub|g'
82 cd tc
82 cd tc
83 hg debugsub
83 hg debugsub
84
84
85 echo % push
85 echo % push
86 echo bah > t/t
86 echo bah > t/t
87 hg ci -m11
87 hg ci -m11
88 hg push | sed 's/ .*sub/ ...sub/g'
88 hg push | sed 's/ .*sub/ ...sub/g'
89
89
90 echo % push -f
90 echo % push -f
91 echo bah > s/a
91 echo bah > s/a
92 hg ci -m12
92 hg ci -m12
93 hg push | sed 's/ .*sub/ ...sub/g'
93 hg push | sed 's/ .*sub/ ...sub/g'
94 hg push -f | sed 's/ .*sub/ ...sub/g'
94 hg push -f | sed 's/ .*sub/ ...sub/g'
95
95
96 echo % update
96 echo % update
97 cd ../t
97 cd ../t
98 hg up -C # discard our earlier merge
98 hg up -C # discard our earlier merge
99 echo blah > t/t
99 echo blah > t/t
100 hg ci -m13
100 hg ci -m13
101
101
102 echo % pull
102 echo % pull
103 cd ../tc
103 cd ../tc
104 hg pull | sed 's/ .*sub/ ...sub/g'
104 hg pull | sed 's/ .*sub/ ...sub/g'
105 # should pull t
105 # should pull t
106 hg up | sed 's|from .*/sub|from .../sub|g'
106 hg up | sed 's|from .*/sub|from .../sub|g'
107 cat t/t
107 cat t/t
108
108
109 echo % bogus subrepo path aborts
109 echo % bogus subrepo path aborts
110 echo 'bogus=[boguspath' >> .hgsub
110 echo 'bogus=[boguspath' >> .hgsub
111 hg ci -m 'bogus subrepo path'
111 hg ci -m 'bogus subrepo path'
112
112
113 echo % issue 1986
113 echo % issue 1986
114 cd ..
114 cd ..
115 rm -rf sub
115 rm -rf sub
116 hg init main
116 hg init main
117 cd main
117 cd main
118
118
119 hg init s # subrepo layout
119 hg init s # subrepo layout
120 cd s #
120 cd s #
121 echo a > a # o 5 br
121 echo a > a # o 5 br
122 hg ci -Am1 # /|
122 hg ci -Am1 # /|
123 hg branch br # o | 4 default
123 hg branch br # o | 4 default
124 echo a >> a # | |
124 echo a >> a # | |
125 hg ci -m1 # | o 3 br
125 hg ci -m1 # | o 3 br
126 hg up default # |/|
126 hg up default # |/|
127 echo b > b # o | 2 default
127 echo b > b # o | 2 default
128 hg ci -Am1 # | |
128 hg ci -Am1 # | |
129 hg up br # | o 1 br
129 hg up br # | o 1 br
130 hg merge tip # |/
130 hg merge tip # |/
131 hg ci -m1 # o 0 default
131 hg ci -m1 # o 0 default
132 hg up 2
132 hg up 2
133 echo c > c
133 echo c > c
134 hg ci -Am1
134 hg ci -Am1
135 hg up 3
135 hg up 3
136 hg merge 4
136 hg merge 4
137 hg ci -m1
137 hg ci -m1
138
138
139 cd .. # main repo layout:
139 cd .. # main repo layout:
140 echo 's = s' > .hgsub #
140 echo 's = s' > .hgsub #
141 hg -R s up 2 # * <-- try to merge default into br again
141 hg -R s up 2 # * <-- try to merge default into br again
142 hg ci -Am1 # .`|
142 hg ci -Am1 # .`|
143 hg branch br # . o 5 br --> substate = 5
143 hg branch br # . o 5 br --> substate = 5
144 echo b > b # . |
144 echo b > b # . |
145 hg -R s up 3 # o | 4 default --> substate = 4
145 hg -R s up 3 # o | 4 default --> substate = 4
146 hg ci -Am1 # | |
146 hg ci -Am1 # | |
147 hg up default # | o 3 br --> substate = 2
147 hg up default # | o 3 br --> substate = 2
148 echo c > c # |/|
148 echo c > c # |/|
149 hg ci -Am1 # o | 2 default --> substate = 2
149 hg ci -Am1 # o | 2 default --> substate = 2
150 hg up 1 # | |
150 hg up 1 # | |
151 hg merge 2 # | o 1 br --> substate = 3
151 hg merge 2 # | o 1 br --> substate = 3
152 hg ci -m1 # |/
152 hg ci -m1 # |/
153 hg up 2 # o 0 default --> substate = 2
153 hg up 2 # o 0 default --> substate = 2
154 hg -R s up 4
154 hg -R s up 4
155 echo d > d
155 echo d > d
156 hg ci -Am1
156 hg ci -Am1
157 hg up 3
157 hg up 3
158 hg -R s up 5
158 hg -R s up 5
159 echo e > e
159 echo e > e
160 hg ci -Am1
160 hg ci -Am1
161
161
162 hg up 5
162 hg up 5
163 hg merge 4 # try to merge default into br again
163 hg merge 4 # try to merge default into br again
164 cd ..
164 cd ..
165
165
166 echo % test subrepo delete from .hgsubstate
166 echo % test subrepo delete from .hgsubstate
167 hg init testdelete
167 hg init testdelete
168 mkdir testdelete/nested testdelete/nested2
168 mkdir testdelete/nested testdelete/nested2
169 hg init testdelete/nested
169 hg init testdelete/nested
170 hg init testdelete/nested2
170 hg init testdelete/nested2
171 echo test > testdelete/nested/foo
171 echo test > testdelete/nested/foo
172 echo test > testdelete/nested2/foo
172 echo test > testdelete/nested2/foo
173 hg -R testdelete/nested add
173 hg -R testdelete/nested add
174 hg -R testdelete/nested2 add
174 hg -R testdelete/nested2 add
175 hg -R testdelete/nested ci -m test
175 hg -R testdelete/nested ci -m test
176 hg -R testdelete/nested2 ci -m test
176 hg -R testdelete/nested2 ci -m test
177 echo nested = nested > testdelete/.hgsub
177 echo nested = nested > testdelete/.hgsub
178 echo nested2 = nested2 >> testdelete/.hgsub
178 echo nested2 = nested2 >> testdelete/.hgsub
179 hg -R testdelete add
179 hg -R testdelete add
180 hg -R testdelete ci -m "nested 1 & 2 added"
180 hg -R testdelete ci -m "nested 1 & 2 added"
181 echo nested = nested > testdelete/.hgsub
181 echo nested = nested > testdelete/.hgsub
182 hg -R testdelete ci -m "nested 2 deleted"
182 hg -R testdelete ci -m "nested 2 deleted"
183 cat testdelete/.hgsubstate | sed "s:.* ::"
183 cat testdelete/.hgsubstate | sed "s:.* ::"
184 hg -R testdelete remove testdelete/.hgsub
184 hg -R testdelete remove testdelete/.hgsub
185 hg -R testdelete ci -m ".hgsub deleted"
185 hg -R testdelete ci -m ".hgsub deleted"
186 cat testdelete/.hgsubstate
186 cat testdelete/.hgsubstate
187
187
188 echo % test repository cloning
188 echo % test repository cloning
189 mkdir mercurial mercurial2
189 mkdir mercurial mercurial2
190 hg init nested_absolute
190 hg init nested_absolute
191 echo test > nested_absolute/foo
191 echo test > nested_absolute/foo
192 hg -R nested_absolute add
192 hg -R nested_absolute add
193 hg -R nested_absolute ci -mtest
193 hg -R nested_absolute ci -mtest
194 cd mercurial
194 cd mercurial
195 hg init nested_relative
195 hg init nested_relative
196 echo test2 > nested_relative/foo2
196 echo test2 > nested_relative/foo2
197 hg -R nested_relative add
197 hg -R nested_relative add
198 hg -R nested_relative ci -mtest2
198 hg -R nested_relative ci -mtest2
199 hg init main
199 hg init main
200 echo "nested_relative = ../nested_relative" > main/.hgsub
200 echo "nested_relative = ../nested_relative" > main/.hgsub
201 echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
201 echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
202 hg -R main add
202 hg -R main add
203 hg -R main ci -m "add subrepos"
203 hg -R main ci -m "add subrepos"
204 cd ..
204 cd ..
205 hg clone mercurial/main mercurial2/main
205 hg clone mercurial/main mercurial2/main
206 cat mercurial2/main/nested_absolute/.hg/hgrc \
206 cat mercurial2/main/nested_absolute/.hg/hgrc \
207 mercurial2/main/nested_relative/.hg/hgrc \
207 mercurial2/main/nested_relative/.hg/hgrc \
208 | "$TESTDIR/filtertmp.py"
208 | "$TESTDIR/filtertmp.py"
209 rm -rf mercurial mercurial2
209 rm -rf mercurial mercurial2
210
210
211 echo % issue 1977
211 echo % issue 1977
212 hg init repo
212 hg init repo
213 hg init repo/s
213 hg init repo/s
214 echo a > repo/s/a
214 echo a > repo/s/a
215 hg -R repo/s ci -Am0
215 hg -R repo/s ci -Am0
216 echo s = s > repo/.hgsub
216 echo s = s > repo/.hgsub
217 hg -R repo ci -Am1
217 hg -R repo ci -Am1
218 hg clone repo repo2
218 hg clone repo repo2 | sed 's|from .*/sub|from .../sub|g'
219 hg -q -R repo2 pull -u
219 hg -q -R repo2 pull -u
220 echo 1 > repo2/s/a
220 echo 1 > repo2/s/a
221 hg -R repo2/s ci -m2
221 hg -R repo2/s ci -m2
222 hg -q -R repo2/s push
222 hg -q -R repo2/s push
223 hg -R repo2/s up -C 0
223 hg -R repo2/s up -C 0
224 echo 2 > repo2/s/a
224 echo 2 > repo2/s/a
225 hg -R repo2/s ci -m3
225 hg -R repo2/s ci -m3
226 hg -R repo2 ci -m3
226 hg -R repo2 ci -m3
227 hg -q -R repo2 push
227 hg -q -R repo2 push
228 hg -R repo update
228 hg -R repo update
229 rm -rf repo2 repo
229 rm -rf repo2 repo
230
230
231 exit 0
231 exit 0
Show file before | Show file after | Hide comments
@@ -1,280 +1,280
1 % first revision, no sub
1 % first revision, no sub
2 adding a
2 adding a
3 % add first sub
3 % add first sub
4 adding a
4 adding a
5 committing subrepository s
5 committing subrepository s
6 % add sub sub
6 % add sub sub
7 committing subrepository s
7 committing subrepository s
8 committing subrepository ss
8 committing subrepository ss
9 % bump sub rev
9 % bump sub rev
10 committing subrepository s
10 committing subrepository s
11 % leave sub dirty
11 % leave sub dirty
12 committing subrepository s
12 committing subrepository s
13 changeset: 3:1c833a7a9e3a
13 changeset: 3:1c833a7a9e3a
14 tag: tip
14 tag: tip
15 user: test
15 user: test
16 date: Thu Jan 01 00:00:00 1970 +0000
16 date: Thu Jan 01 00:00:00 1970 +0000
17 summary: 4
17 summary: 4
18
18
19 % check caching
19 % check caching
20 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
20 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
21 % restore
21 % restore
22 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
22 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 path s
23 path s
24 source s
24 source s
25 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
25 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
26 % new branch for merge tests
26 % new branch for merge tests
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 adding t/t
28 adding t/t
29 % 5
29 % 5
30 committing subrepository t
30 committing subrepository t
31 created new head
31 created new head
32 % 6
32 % 6
33 committing subrepository t
33 committing subrepository t
34 path s
34 path s
35 source s
35 source s
36 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
36 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
37 path t
37 path t
38 source t
38 source t
39 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
39 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
40 % 7
40 % 7
41 committing subrepository t
41 committing subrepository t
42 % 8
42 % 8
43 % merge tests
43 % merge tests
44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
45 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
46 (branch merge, don't forget to commit)
46 (branch merge, don't forget to commit)
47 path s
47 path s
48 source s
48 source s
49 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
49 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
50 path t
50 path t
51 source t
51 source t
52 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
52 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
53 created new head
53 created new head
54 searching for copies back to rev 2
54 searching for copies back to rev 2
55 resolving manifests
55 resolving manifests
56 overwrite None partial False
56 overwrite None partial False
57 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
57 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
58 .hgsubstate: versions differ -> m
58 .hgsubstate: versions differ -> m
59 update: .hgsubstate 1/1 files (100.00%)
59 update: .hgsubstate 1/1 files (100.00%)
60 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
60 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
61 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
61 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
62 getting subrepo t
62 getting subrepo t
63 resolving manifests
63 resolving manifests
64 overwrite True partial False
64 overwrite True partial False
65 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
65 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
66 t: remote is newer -> g
66 t: remote is newer -> g
67 update: t 1/1 files (100.00%)
67 update: t 1/1 files (100.00%)
68 getting t
68 getting t
69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
70 (branch merge, don't forget to commit)
70 (branch merge, don't forget to commit)
71 path s
71 path s
72 source s
72 source s
73 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
73 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
74 path t
74 path t
75 source t
75 source t
76 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
76 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
77 committing subrepository t
77 committing subrepository t
78 searching for copies back to rev 2
78 searching for copies back to rev 2
79 resolving manifests
79 resolving manifests
80 overwrite None partial False
80 overwrite None partial False
81 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
81 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
82 .hgsubstate: versions differ -> m
82 .hgsubstate: versions differ -> m
83 update: .hgsubstate 1/1 files (100.00%)
83 update: .hgsubstate 1/1 files (100.00%)
84 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
84 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
85 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
85 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
86 merging subrepo t
86 merging subrepo t
87 searching for copies back to rev 2
87 searching for copies back to rev 2
88 resolving manifests
88 resolving manifests
89 overwrite None partial False
89 overwrite None partial False
90 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
90 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
91 t: versions differ -> m
91 t: versions differ -> m
92 preserving t for resolve of t
92 preserving t for resolve of t
93 update: t 1/1 files (100.00%)
93 update: t 1/1 files (100.00%)
94 picked tool 'internal:merge' for t (binary False symlink False)
94 picked tool 'internal:merge' for t (binary False symlink False)
95 merging t
95 merging t
96 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
96 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
97 warning: conflicts during merge.
97 warning: conflicts during merge.
98 merging t failed!
98 merging t failed!
99 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
99 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
100 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
100 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
101 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
102 (branch merge, don't forget to commit)
102 (branch merge, don't forget to commit)
103 % should conflict
103 % should conflict
104 <<<<<<< local
104 <<<<<<< local
105 conflict
105 conflict
106 =======
106 =======
107 t3
107 t3
108 >>>>>>> other
108 >>>>>>> other
109 % clone
109 % clone
110 updating to branch default
110 updating to branch default
111 pulling subrepo s from .../sub/t/s
111 pulling subrepo s from .../sub/t/s
112 requesting all changes
112 requesting all changes
113 adding changesets
113 adding changesets
114 adding manifests
114 adding manifests
115 adding file changes
115 adding file changes
116 added 4 changesets with 5 changes to 3 files
116 added 4 changesets with 5 changes to 3 files
117 pulling subrepo ss from .../sub/t/s/ss
117 pulling subrepo ss from .../sub/t/s/ss
118 requesting all changes
118 requesting all changes
119 adding changesets
119 adding changesets
120 adding manifests
120 adding manifests
121 adding file changes
121 adding file changes
122 added 1 changesets with 1 changes to 1 files
122 added 1 changesets with 1 changes to 1 files
123 pulling subrepo t from .../sub/t/t
123 pulling subrepo t from .../sub/t/t
124 requesting all changes
124 requesting all changes
125 adding changesets
125 adding changesets
126 adding manifests
126 adding manifests
127 adding file changes
127 adding file changes
128 added 4 changesets with 4 changes to 1 files (+1 heads)
128 added 4 changesets with 4 changes to 1 files (+1 heads)
129 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
129 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
130 path s
130 path s
131 source s
131 source s
132 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
132 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
133 path t
133 path t
134 source t
134 source t
135 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
135 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
136 % push
136 % push
137 committing subrepository t
137 committing subrepository t
138 pushing ...sub/t
138 pushing ...sub/t
139 pushing ...subrepo ss
139 pushing ...subrepo ss
140 searching for changes
140 searching for changes
141 no changes found
141 no changes found
142 pushing ...subrepo s
142 pushing ...subrepo s
143 searching for changes
143 searching for changes
144 no changes found
144 no changes found
145 pushing ...subrepo t
145 pushing ...subrepo t
146 searching for changes
146 searching for changes
147 adding changesets
147 adding changesets
148 adding manifests
148 adding manifests
149 adding file changes
149 adding file changes
150 added 1 changesets with 1 changes to 1 files
150 added 1 changesets with 1 changes to 1 files
151 searching for changes
151 searching for changes
152 adding changesets
152 adding changesets
153 adding manifests
153 adding manifests
154 adding file changes
154 adding file changes
155 added 1 changesets with 1 changes to 1 files
155 added 1 changesets with 1 changes to 1 files
156 % push -f
156 % push -f
157 committing subrepository s
157 committing subrepository s
158 abort: push creates new remote heads on branch 'default'!
158 abort: push creates new remote heads on branch 'default'!
159 pushing ...sub/t
159 pushing ...sub/t
160 pushing ...subrepo ss
160 pushing ...subrepo ss
161 searching for changes
161 searching for changes
162 no changes found
162 no changes found
163 pushing ...subrepo s
163 pushing ...subrepo s
164 searching for changes
164 searching for changes
165 (did you forget to merge? use push -f to force)
165 (did you forget to merge? use push -f to force)
166 pushing ...sub/t
166 pushing ...sub/t
167 pushing ...subrepo ss
167 pushing ...subrepo ss
168 searching for changes
168 searching for changes
169 no changes found
169 no changes found
170 pushing ...subrepo s
170 pushing ...subrepo s
171 searching for changes
171 searching for changes
172 adding changesets
172 adding changesets
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 pushing ...subrepo t
176 pushing ...subrepo t
177 searching for changes
177 searching for changes
178 no changes found
178 no changes found
179 searching for changes
179 searching for changes
180 adding changesets
180 adding changesets
181 adding manifests
181 adding manifests
182 adding file changes
182 adding file changes
183 added 1 changesets with 1 changes to 1 files
183 added 1 changesets with 1 changes to 1 files
184 % update
184 % update
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
186 committing subrepository t
186 committing subrepository t
187 % pull
187 % pull
188 pulling ...sub/t
188 pulling ...sub/t
189 searching for changes
189 searching for changes
190 adding changesets
190 adding changesets
191 adding manifests
191 adding manifests
192 adding file changes
192 adding file changes
193 added 1 changesets with 1 changes to 1 files
193 added 1 changesets with 1 changes to 1 files
194 (run 'hg update' to get a working copy)
194 (run 'hg update' to get a working copy)
195 pulling subrepo t from .../sub/t/t
195 pulling subrepo t from .../sub/t/t
196 searching for changes
196 searching for changes
197 adding changesets
197 adding changesets
198 adding manifests
198 adding manifests
199 adding file changes
199 adding file changes
200 added 1 changesets with 1 changes to 1 files
200 added 1 changesets with 1 changes to 1 files
201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
201 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
202 blah
202 blah
203 % bogus subrepo path aborts
203 % bogus subrepo path aborts
204 abort: missing ] in subrepo source
204 abort: missing ] in subrepo source
205 % issue 1986
205 % issue 1986
206 adding a
206 adding a
207 marked working directory as branch br
207 marked working directory as branch br
208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
209 adding b
209 adding b
210 created new head
210 created new head
211 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
211 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
213 (branch merge, don't forget to commit)
213 (branch merge, don't forget to commit)
214 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
215 adding c
215 adding c
216 created new head
216 created new head
217 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
217 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
219 (branch merge, don't forget to commit)
219 (branch merge, don't forget to commit)
220 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
220 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
221 adding .hgsub
221 adding .hgsub
222 committing subrepository s
222 committing subrepository s
223 marked working directory as branch br
223 marked working directory as branch br
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
225 adding b
225 adding b
226 committing subrepository s
226 committing subrepository s
227 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
227 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
228 adding c
228 adding c
229 created new head
229 created new head
230 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
230 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
232 (branch merge, don't forget to commit)
232 (branch merge, don't forget to commit)
233 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
233 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
234 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
234 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
235 adding d
235 adding d
236 committing subrepository s
236 committing subrepository s
237 created new head
237 created new head
238 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
238 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
239 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
239 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
240 adding e
240 adding e
241 committing subrepository s
241 committing subrepository s
242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
242 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
244 (branch merge, don't forget to commit)
244 (branch merge, don't forget to commit)
245 % test subrepo delete from .hgsubstate
245 % test subrepo delete from .hgsubstate
246 adding testdelete/nested/foo
246 adding testdelete/nested/foo
247 adding testdelete/nested2/foo
247 adding testdelete/nested2/foo
248 adding testdelete/.hgsub
248 adding testdelete/.hgsub
249 committing subrepository nested2
249 committing subrepository nested2
250 committing subrepository nested
250 committing subrepository nested
251 nested
251 nested
252 % test repository cloning
252 % test repository cloning
253 adding nested_absolute/foo
253 adding nested_absolute/foo
254 adding nested_relative/foo2
254 adding nested_relative/foo2
255 adding main/.hgsub
255 adding main/.hgsub
256 committing subrepository nested_relative
256 committing subrepository nested_relative
257 committing subrepository nested_absolute
257 committing subrepository nested_absolute
258 updating to branch default
258 updating to branch default
259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
259 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
260 [paths]
260 [paths]
261 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
261 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
262 [paths]
262 [paths]
263 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative
263 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative
264 % issue 1977
264 % issue 1977
265 adding a
265 adding a
266 adding .hgsub
266 adding .hgsub
267 committing subrepository s
267 committing subrepository s
268 updating to branch default
268 updating to branch default
269 pulling subrepo s
269 pulling subrepo s from .../sub/repo/s
270 requesting all changes
270 requesting all changes
271 adding changesets
271 adding changesets
272 adding manifests
272 adding manifests
273 adding file changes
273 adding file changes
274 added 1 changesets with 1 changes to 1 files
274 added 1 changesets with 1 changes to 1 files
275 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
276 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
276 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
277 created new head
277 created new head
278 committing subrepository s
278 committing subrepository s
279 abort: push creates new remote heads on branch 'default'!
279 abort: push creates new remote heads on branch 'default'!
280 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
280 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
General Comments 0
You need to be logged in to leave comments. Login now