Show More
@@ -362,7 +362,7 b' def _nowarnheads(pushop):' | |||||
362 | def checkheads(pushop): |
|
362 | def checkheads(pushop): | |
363 | """Check that a push won't add any outgoing head |
|
363 | """Check that a push won't add any outgoing head | |
364 |
|
364 | |||
365 |
raise |
|
365 | raise StateError error and display ui message as needed. | |
366 | """ |
|
366 | """ | |
367 |
|
367 | |||
368 | repo = pushop.repo.unfiltered() |
|
368 | repo = pushop.repo.unfiltered() | |
@@ -409,7 +409,7 b' def checkheads(pushop):' | |||||
409 | else: |
|
409 | else: | |
410 | errmsg = _(b"push creates new remote branches: %s") % branchnames |
|
410 | errmsg = _(b"push creates new remote branches: %s") % branchnames | |
411 | hint = _(b"use 'hg push --new-branch' to create new remote branches") |
|
411 | hint = _(b"use 'hg push --new-branch' to create new remote branches") | |
412 |
raise error. |
|
412 | raise error.StateError(errmsg, hint=hint) | |
413 |
|
413 | |||
414 | # 2. Find heads that we need not warn about |
|
414 | # 2. Find heads that we need not warn about | |
415 | nowarnheads = _nowarnheads(pushop) |
|
415 | nowarnheads = _nowarnheads(pushop) | |
@@ -505,7 +505,7 b' def checkheads(pushop):' | |||||
505 | for h in dhs: |
|
505 | for h in dhs: | |
506 | repo.ui.note(b" %s\n" % short(h)) |
|
506 | repo.ui.note(b" %s\n" % short(h)) | |
507 | if errormsg: |
|
507 | if errormsg: | |
508 |
raise error. |
|
508 | raise error.StateError(errormsg, hint=hint) | |
509 |
|
509 | |||
510 |
|
510 | |||
511 | def _postprocessobsolete(pushop, futurecommon, candidate_newhs): |
|
511 | def _postprocessobsolete(pushop, futurecommon, candidate_newhs): |
@@ -742,7 +742,7 b' diverging a remote bookmark fails' | |||||
742 | searching for changes |
|
742 | searching for changes | |
743 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
|
743 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' | |
744 | (merge or see 'hg help push' for details about pushing new heads) |
|
744 | (merge or see 'hg help push' for details about pushing new heads) | |
745 |
[2 |
|
745 | [20] | |
746 | $ hg -R ../a book |
|
746 | $ hg -R ../a book | |
747 | @ 1:0d2164f0ce0d |
|
747 | @ 1:0d2164f0ce0d | |
748 | * X 1:0d2164f0ce0d |
|
748 | * X 1:0d2164f0ce0d | |
@@ -759,7 +759,7 b' Unrelated marker does not alter the deci' | |||||
759 | searching for changes |
|
759 | searching for changes | |
760 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' |
|
760 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' | |
761 | (merge or see 'hg help push' for details about pushing new heads) |
|
761 | (merge or see 'hg help push' for details about pushing new heads) | |
762 |
[2 |
|
762 | [20] | |
763 | $ hg -R ../a book |
|
763 | $ hg -R ../a book | |
764 | @ 1:0d2164f0ce0d |
|
764 | @ 1:0d2164f0ce0d | |
765 | * X 1:0d2164f0ce0d |
|
765 | * X 1:0d2164f0ce0d | |
@@ -1055,7 +1055,7 b' pushing an existing but divergent bookma' | |||||
1055 | remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
|
1055 | remote has heads on branch 'default' that are not known locally: a2a606d9ff1b | |
1056 | abort: push creates new remote head 54694f811df9 with bookmark 'X' |
|
1056 | abort: push creates new remote head 54694f811df9 with bookmark 'X' | |
1057 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
1057 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
1058 |
[2 |
|
1058 | [20] | |
1059 | $ cd ../addmarks |
|
1059 | $ cd ../addmarks | |
1060 |
|
1060 | |||
1061 | Check summary output for incoming/outgoing bookmarks |
|
1061 | Check summary output for incoming/outgoing bookmarks |
@@ -201,7 +201,7 b' check it complains about multiple heads' | |||||
201 | searching for changes |
|
201 | searching for changes | |
202 | abort: push creates new remote head e5ea8f9c7314 |
|
202 | abort: push creates new remote head e5ea8f9c7314 | |
203 | (merge or see 'hg help push' for details about pushing new heads) |
|
203 | (merge or see 'hg help push' for details about pushing new heads) | |
204 |
[2 |
|
204 | [20] | |
205 | $ cd .. |
|
205 | $ cd .. | |
206 |
|
206 | |||
207 | test obsmarkers exchange. |
|
207 | test obsmarkers exchange. |
@@ -97,7 +97,7 b' Abort: old will still be an head because' | |||||
97 | searching for changes |
|
97 | searching for changes | |
98 | abort: push creates new remote head 71e3228bffe1 |
|
98 | abort: push creates new remote head 71e3228bffe1 | |
99 | (merge or see 'hg help push' for details about pushing new heads) |
|
99 | (merge or see 'hg help push' for details about pushing new heads) | |
100 |
[2 |
|
100 | [20] | |
101 |
|
101 | |||
102 | old head is now public (public remote version) |
|
102 | old head is now public (public remote version) | |
103 | ============================================== |
|
103 | ============================================== | |
@@ -157,7 +157,7 b' Push should abort on new head' | |||||
157 | searching for changes |
|
157 | searching for changes | |
158 | abort: push creates new remote head d7d41ccbd4de |
|
158 | abort: push creates new remote head d7d41ccbd4de | |
159 | (merge or see 'hg help push' for details about pushing new heads) |
|
159 | (merge or see 'hg help push' for details about pushing new heads) | |
160 |
[2 |
|
160 | [20] | |
161 |
|
161 | |||
162 |
|
162 | |||
163 |
|
163 | |||
@@ -269,7 +269,7 b' We do not have enought data to take the ' | |||||
269 | remote has heads on branch 'default' that are not known locally: c70b08862e08 |
|
269 | remote has heads on branch 'default' that are not known locally: c70b08862e08 | |
270 | abort: push creates new remote head 71e3228bffe1 |
|
270 | abort: push creates new remote head 71e3228bffe1 | |
271 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
271 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
272 |
[2 |
|
272 | [20] | |
273 |
|
273 | |||
274 | Pulling the missing data makes it work |
|
274 | Pulling the missing data makes it work | |
275 |
|
275 | |||
@@ -319,4 +319,4 b' setup' | |||||
319 | searching for changes |
|
319 | searching for changes | |
320 | abort: push creates new remote head 350a93b716be |
|
320 | abort: push creates new remote head 350a93b716be | |
321 | (merge or see 'hg help push' for details about pushing new heads) |
|
321 | (merge or see 'hg help push' for details about pushing new heads) | |
322 |
[2 |
|
322 | [20] |
@@ -1017,7 +1017,7 b' appear on the remote side.' | |||||
1017 | searching for changes |
|
1017 | searching for changes | |
1018 | abort: push creates new remote head 435b5d83910c |
|
1018 | abort: push creates new remote head 435b5d83910c | |
1019 | (merge or see 'hg help push' for details about pushing new heads) |
|
1019 | (merge or see 'hg help push' for details about pushing new heads) | |
1020 |
[2 |
|
1020 | [20] | |
1021 | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head |
|
1021 | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head | |
1022 | pushing to ../mu |
|
1022 | pushing to ../mu | |
1023 | searching for changes |
|
1023 | searching for changes |
@@ -89,6 +89,6 b' Actual testing' | |||||
89 | searching for changes |
|
89 | searching for changes | |
90 | abort: push creates new remote head dc44c53142f0 |
|
90 | abort: push creates new remote head dc44c53142f0 | |
91 | (merge or see 'hg help push' for details about pushing new heads) |
|
91 | (merge or see 'hg help push' for details about pushing new heads) | |
92 |
[2 |
|
92 | [20] | |
93 |
|
93 | |||
94 | $ cd ../.. |
|
94 | $ cd ../.. |
@@ -80,6 +80,6 b' Actual testing' | |||||
80 | searching for changes |
|
80 | searching for changes | |
81 | abort: push creates new remote head 25c56d33e4c4 |
|
81 | abort: push creates new remote head 25c56d33e4c4 | |
82 | (merge or see 'hg help push' for details about pushing new heads) |
|
82 | (merge or see 'hg help push' for details about pushing new heads) | |
83 |
[2 |
|
83 | [20] | |
84 |
|
84 | |||
85 | $ cd ../.. |
|
85 | $ cd ../.. |
@@ -81,6 +81,6 b' Actual testing' | |||||
81 | searching for changes |
|
81 | searching for changes | |
82 | abort: push creates new remote head f6082bc4ffef |
|
82 | abort: push creates new remote head f6082bc4ffef | |
83 | (merge or see 'hg help push' for details about pushing new heads) |
|
83 | (merge or see 'hg help push' for details about pushing new heads) | |
84 |
[2 |
|
84 | [20] | |
85 |
|
85 | |||
86 | $ cd ../.. |
|
86 | $ cd ../.. |
@@ -80,6 +80,6 b' Actual testing' | |||||
80 | searching for changes |
|
80 | searching for changes | |
81 | abort: push creates new remote head 0f88766e02d6 |
|
81 | abort: push creates new remote head 0f88766e02d6 | |
82 | (merge or see 'hg help push' for details about pushing new heads) |
|
82 | (merge or see 'hg help push' for details about pushing new heads) | |
83 |
[2 |
|
83 | [20] | |
84 |
|
84 | |||
85 | $ cd ../.. |
|
85 | $ cd ../.. |
@@ -81,6 +81,6 b' Actual testing' | |||||
81 | searching for changes |
|
81 | searching for changes | |
82 | abort: push creates new remote head 0f88766e02d6 |
|
82 | abort: push creates new remote head 0f88766e02d6 | |
83 | (merge or see 'hg help push' for details about pushing new heads) |
|
83 | (merge or see 'hg help push' for details about pushing new heads) | |
84 |
[2 |
|
84 | [20] | |
85 |
|
85 | |||
86 | $ cd ../.. |
|
86 | $ cd ../.. |
@@ -73,7 +73,7 b' Actual testing' | |||||
73 | searching for changes |
|
73 | searching for changes | |
74 | abort: push creates new remote head 74ff5441d343 |
|
74 | abort: push creates new remote head 74ff5441d343 | |
75 | (merge or see 'hg help push' for details about pushing new heads) |
|
75 | (merge or see 'hg help push' for details about pushing new heads) | |
76 |
[2 |
|
76 | [20] | |
77 |
|
77 | |||
78 | $ cd ../.. |
|
78 | $ cd ../.. | |
79 |
|
79 |
@@ -94,6 +94,6 b' Actual testing' | |||||
94 | searching for changes |
|
94 | searching for changes | |
95 | abort: push creates new remote head 0f88766e02d6 |
|
95 | abort: push creates new remote head 0f88766e02d6 | |
96 | (merge or see 'hg help push' for details about pushing new heads) |
|
96 | (merge or see 'hg help push' for details about pushing new heads) | |
97 |
[2 |
|
97 | [20] | |
98 |
|
98 | |||
99 | $ cd ../.. |
|
99 | $ cd ../.. |
@@ -93,13 +93,13 b' Actual testing' | |||||
93 | searching for changes |
|
93 | searching for changes | |
94 | abort: push creates new remote head f6082bc4ffef |
|
94 | abort: push creates new remote head f6082bc4ffef | |
95 | (merge or see 'hg help push' for details about pushing new heads) |
|
95 | (merge or see 'hg help push' for details about pushing new heads) | |
96 |
[2 |
|
96 | [20] | |
97 | $ hg push --rev 'desc(B1)' |
|
97 | $ hg push --rev 'desc(B1)' | |
98 | pushing to $TESTTMP/D3/server |
|
98 | pushing to $TESTTMP/D3/server | |
99 | searching for changes |
|
99 | searching for changes | |
100 | abort: push creates new remote head 25c56d33e4c4 |
|
100 | abort: push creates new remote head 25c56d33e4c4 | |
101 | (merge or see 'hg help push' for details about pushing new heads) |
|
101 | (merge or see 'hg help push' for details about pushing new heads) | |
102 |
[2 |
|
102 | [20] | |
103 |
|
103 | |||
104 | Extra testing |
|
104 | Extra testing | |
105 | ------------- |
|
105 | ------------- | |
@@ -111,6 +111,6 b' In this case, even a bare push is creati' | |||||
111 | searching for changes |
|
111 | searching for changes | |
112 | abort: push creates new remote head 25c56d33e4c4 |
|
112 | abort: push creates new remote head 25c56d33e4c4 | |
113 | (merge or see 'hg help push' for details about pushing new heads) |
|
113 | (merge or see 'hg help push' for details about pushing new heads) | |
114 |
[2 |
|
114 | [20] | |
115 |
|
115 | |||
116 | $ cd ../.. |
|
116 | $ cd ../.. |
@@ -111,7 +111,7 b' Actual testing (new branch only)' | |||||
111 | searching for changes |
|
111 | searching for changes | |
112 | abort: push creates new remote head f6082bc4ffef |
|
112 | abort: push creates new remote head f6082bc4ffef | |
113 | (merge or see 'hg help push' for details about pushing new heads) |
|
113 | (merge or see 'hg help push' for details about pushing new heads) | |
114 |
[2 |
|
114 | [20] | |
115 |
|
115 | |||
116 | Actual testing (existing branch only) |
|
116 | Actual testing (existing branch only) | |
117 | ------------------------------------ |
|
117 | ------------------------------------ |
@@ -100,7 +100,7 b' Actual testing' | |||||
100 | searching for changes |
|
100 | searching for changes | |
101 | abort: push creates new remote head 25c56d33e4c4 |
|
101 | abort: push creates new remote head 25c56d33e4c4 | |
102 | (merge or see 'hg help push' for details about pushing new heads) |
|
102 | (merge or see 'hg help push' for details about pushing new heads) | |
103 |
[2 |
|
103 | [20] | |
104 | $ hg push --rev 'desc(A1)' |
|
104 | $ hg push --rev 'desc(A1)' | |
105 | pushing to $TESTTMP/D5/server |
|
105 | pushing to $TESTTMP/D5/server | |
106 | searching for changes |
|
106 | searching for changes |
@@ -81,6 +81,6 b' Actual testing' | |||||
81 | searching for changes |
|
81 | searching for changes | |
82 | abort: push creates new remote head 0f88766e02d6 |
|
82 | abort: push creates new remote head 0f88766e02d6 | |
83 | (merge or see 'hg help push' for details about pushing new heads) |
|
83 | (merge or see 'hg help push' for details about pushing new heads) | |
84 |
[2 |
|
84 | [20] | |
85 |
|
85 | |||
86 | $ cd ../.. |
|
86 | $ cd ../.. |
@@ -33,7 +33,7 b' Specifying a revset that evaluates to nu' | |||||
33 | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a |
|
33 | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | |
34 | abort: push creates new remote head 1e108cc5548c |
|
34 | abort: push creates new remote head 1e108cc5548c | |
35 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
35 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
36 |
[2 |
|
36 | [20] | |
37 |
|
37 | |||
38 | $ hg push --debug ../a |
|
38 | $ hg push --debug ../a | |
39 | pushing to ../a |
|
39 | pushing to ../a | |
@@ -51,7 +51,7 b' Specifying a revset that evaluates to nu' | |||||
51 | 1e108cc5548c |
|
51 | 1e108cc5548c | |
52 | abort: push creates new remote head 1e108cc5548c |
|
52 | abort: push creates new remote head 1e108cc5548c | |
53 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
53 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
54 |
[2 |
|
54 | [20] | |
55 |
|
55 | |||
56 | $ hg pull ../a |
|
56 | $ hg pull ../a | |
57 | pulling from ../a |
|
57 | pulling from ../a | |
@@ -68,7 +68,7 b' Specifying a revset that evaluates to nu' | |||||
68 | searching for changes |
|
68 | searching for changes | |
69 | abort: push creates new remote head 1e108cc5548c |
|
69 | abort: push creates new remote head 1e108cc5548c | |
70 | (merge or see 'hg help push' for details about pushing new heads) |
|
70 | (merge or see 'hg help push' for details about pushing new heads) | |
71 |
[2 |
|
71 | [20] | |
72 |
|
72 | |||
73 | $ hg merge |
|
73 | $ hg merge | |
74 | 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 | |
@@ -121,7 +121,7 b' Specifying a revset that evaluates to nu' | |||||
121 | searching for changes |
|
121 | searching for changes | |
122 | abort: push creates new remote head 6346d66eb9f5 |
|
122 | abort: push creates new remote head 6346d66eb9f5 | |
123 | (merge or see 'hg help push' for details about pushing new heads) |
|
123 | (merge or see 'hg help push' for details about pushing new heads) | |
124 |
[2 |
|
124 | [20] | |
125 |
|
125 | |||
126 | $ hg push -r 2 ../c |
|
126 | $ hg push -r 2 ../c | |
127 | pushing to ../c |
|
127 | pushing to ../c | |
@@ -134,7 +134,7 b' Specifying a revset that evaluates to nu' | |||||
134 | searching for changes |
|
134 | searching for changes | |
135 | abort: push creates new remote head a5dda829a167 |
|
135 | abort: push creates new remote head a5dda829a167 | |
136 | (merge or see 'hg help push' for details about pushing new heads) |
|
136 | (merge or see 'hg help push' for details about pushing new heads) | |
137 |
[2 |
|
137 | [20] | |
138 |
|
138 | |||
139 | $ hg push -v -r 3 -r 4 ../c |
|
139 | $ hg push -v -r 3 -r 4 ../c | |
140 | pushing to ../c |
|
140 | pushing to ../c | |
@@ -144,7 +144,7 b' Specifying a revset that evaluates to nu' | |||||
144 | ee8fbc7a0295 |
|
144 | ee8fbc7a0295 | |
145 | abort: push creates new remote head a5dda829a167 |
|
145 | abort: push creates new remote head a5dda829a167 | |
146 | (merge or see 'hg help push' for details about pushing new heads) |
|
146 | (merge or see 'hg help push' for details about pushing new heads) | |
147 |
[2 |
|
147 | [20] | |
148 |
|
148 | |||
149 | $ hg push -v -f -r 3 -r 4 ../c |
|
149 | $ hg push -v -f -r 3 -r 4 ../c | |
150 | pushing to ../c |
|
150 | pushing to ../c | |
@@ -234,14 +234,14 b' Push on existing branch and new branch:' | |||||
234 | searching for changes |
|
234 | searching for changes | |
235 | abort: push creates new remote branches: c |
|
235 | abort: push creates new remote branches: c | |
236 | (use 'hg push --new-branch' to create new remote branches) |
|
236 | (use 'hg push --new-branch' to create new remote branches) | |
237 |
[2 |
|
237 | [20] | |
238 |
|
238 | |||
239 | $ hg push -r 4 -r 5 ../f |
|
239 | $ hg push -r 4 -r 5 ../f | |
240 | pushing to ../f |
|
240 | pushing to ../f | |
241 | searching for changes |
|
241 | searching for changes | |
242 | abort: push creates new remote branches: c |
|
242 | abort: push creates new remote branches: c | |
243 | (use 'hg push --new-branch' to create new remote branches) |
|
243 | (use 'hg push --new-branch' to create new remote branches) | |
244 |
[2 |
|
244 | [20] | |
245 |
|
245 | |||
246 |
|
246 | |||
247 | Multiple new branches: |
|
247 | Multiple new branches: | |
@@ -255,14 +255,14 b' Multiple new branches:' | |||||
255 | searching for changes |
|
255 | searching for changes | |
256 | abort: push creates new remote branches: c, d |
|
256 | abort: push creates new remote branches: c, d | |
257 | (use 'hg push --new-branch' to create new remote branches) |
|
257 | (use 'hg push --new-branch' to create new remote branches) | |
258 |
[2 |
|
258 | [20] | |
259 |
|
259 | |||
260 | $ hg push -r 4 -r 6 ../f |
|
260 | $ hg push -r 4 -r 6 ../f | |
261 | pushing to ../f |
|
261 | pushing to ../f | |
262 | searching for changes |
|
262 | searching for changes | |
263 | abort: push creates new remote branches: c, d |
|
263 | abort: push creates new remote branches: c, d | |
264 | (use 'hg push --new-branch' to create new remote branches) |
|
264 | (use 'hg push --new-branch' to create new remote branches) | |
265 |
[2 |
|
265 | [20] | |
266 |
|
266 | |||
267 | $ cd ../g |
|
267 | $ cd ../g | |
268 |
|
268 | |||
@@ -278,7 +278,7 b' Fail on multiple head push:' | |||||
278 | searching for changes |
|
278 | searching for changes | |
279 | abort: push creates new remote head 0b715ef6ff8f on branch 'a' |
|
279 | abort: push creates new remote head 0b715ef6ff8f on branch 'a' | |
280 | (merge or see 'hg help push' for details about pushing new heads) |
|
280 | (merge or see 'hg help push' for details about pushing new heads) | |
281 |
[2 |
|
281 | [20] | |
282 |
|
282 | |||
283 | Push replacement head on existing branches: |
|
283 | Push replacement head on existing branches: | |
284 |
|
284 | |||
@@ -355,7 +355,7 b' Failed push of new named branch:' | |||||
355 | searching for changes |
|
355 | searching for changes | |
356 | abort: push creates new remote branches: e |
|
356 | abort: push creates new remote branches: e | |
357 | (use 'hg push --new-branch' to create new remote branches) |
|
357 | (use 'hg push --new-branch' to create new remote branches) | |
358 |
[2 |
|
358 | [20] | |
359 |
|
359 | |||
360 |
|
360 | |||
361 | Using --new-branch to push new named branch: |
|
361 | Using --new-branch to push new named branch: | |
@@ -383,7 +383,7 b' Pushing multi headed new branch:' | |||||
383 | searching for changes |
|
383 | searching for changes | |
384 | abort: push creates new branch 'f' with multiple heads |
|
384 | abort: push creates new branch 'f' with multiple heads | |
385 | (merge or see 'hg help push' for details about pushing new heads) |
|
385 | (merge or see 'hg help push' for details about pushing new heads) | |
386 |
[2 |
|
386 | [20] | |
387 | $ hg push --branch f --new-branch --force ../f |
|
387 | $ hg push --branch f --new-branch --force ../f | |
388 | pushing to ../f |
|
388 | pushing to ../f | |
389 | searching for changes |
|
389 | searching for changes | |
@@ -427,7 +427,7 b" multiple new heads but also doesn't repo" | |||||
427 | remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 |
|
427 | remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | |
428 | abort: push creates new remote head 97bd0c84d346 |
|
428 | abort: push creates new remote head 97bd0c84d346 | |
429 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
429 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
430 |
[2 |
|
430 | [20] | |
431 | $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx |
|
431 | $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx | |
432 | $ hg -R i push h |
|
432 | $ hg -R i push h | |
433 | pushing to h |
|
433 | pushing to h | |
@@ -435,7 +435,7 b" multiple new heads but also doesn't repo" | |||||
435 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others |
|
435 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others | |
436 | abort: push creates new remote head 97bd0c84d346 |
|
436 | abort: push creates new remote head 97bd0c84d346 | |
437 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
437 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
438 |
[2 |
|
438 | [20] | |
439 | $ hg -R i push h -v |
|
439 | $ hg -R i push h -v | |
440 | pushing to h |
|
440 | pushing to h | |
441 | searching for changes |
|
441 | searching for changes | |
@@ -444,7 +444,7 b" multiple new heads but also doesn't repo" | |||||
444 | 97bd0c84d346 |
|
444 | 97bd0c84d346 | |
445 | abort: push creates new remote head 97bd0c84d346 |
|
445 | abort: push creates new remote head 97bd0c84d346 | |
446 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
446 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
447 |
[2 |
|
447 | [20] | |
448 |
|
448 | |||
449 |
|
449 | |||
450 | Check prepush logic with merged branches: |
|
450 | Check prepush logic with merged branches: | |
@@ -479,7 +479,7 b' Check prepush logic with merged branches' | |||||
479 | searching for changes |
|
479 | searching for changes | |
480 | abort: push creates new remote branches: b |
|
480 | abort: push creates new remote branches: b | |
481 | (use 'hg push --new-branch' to create new remote branches) |
|
481 | (use 'hg push --new-branch' to create new remote branches) | |
482 |
[2 |
|
482 | [20] | |
483 |
|
483 | |||
484 |
|
484 | |||
485 | Prepush -r should not allow you to sneak in new heads: |
|
485 | Prepush -r should not allow you to sneak in new heads: | |
@@ -515,7 +515,7 b' Prepush -r should not allow you to sneak' | |||||
515 | searching for changes |
|
515 | searching for changes | |
516 | abort: push creates new remote head 451211cc22b0 on branch 'a' |
|
516 | abort: push creates new remote head 451211cc22b0 on branch 'a' | |
517 | (merge or see 'hg help push' for details about pushing new heads) |
|
517 | (merge or see 'hg help push' for details about pushing new heads) | |
518 |
[2 |
|
518 | [20] | |
519 |
|
519 | |||
520 | $ cd .. |
|
520 | $ cd .. | |
521 |
|
521 | |||
@@ -765,14 +765,14 b' outgoing:' | |||||
765 | searching for changes |
|
765 | searching for changes | |
766 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' |
|
766 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | |
767 | (merge or see 'hg help push' for details about pushing new heads) |
|
767 | (merge or see 'hg help push' for details about pushing new heads) | |
768 |
[2 |
|
768 | [20] | |
769 |
|
769 | |||
770 | $ hg push inner -r4 -r5 |
|
770 | $ hg push inner -r4 -r5 | |
771 | pushing to inner |
|
771 | pushing to inner | |
772 | searching for changes |
|
772 | searching for changes | |
773 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' |
|
773 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | |
774 | (merge or see 'hg help push' for details about pushing new heads) |
|
774 | (merge or see 'hg help push' for details about pushing new heads) | |
775 |
[2 |
|
775 | [20] | |
776 |
|
776 | |||
777 | $ hg in inner |
|
777 | $ hg in inner | |
778 | comparing with inner |
|
778 | comparing with inner | |
@@ -788,7 +788,7 b' Test fail hook' | |||||
788 | running fail-push hook |
|
788 | running fail-push hook | |
789 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' |
|
789 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | |
790 | (merge or see 'hg help push' for details about pushing new heads) |
|
790 | (merge or see 'hg help push' for details about pushing new heads) | |
791 |
[2 |
|
791 | [20] | |
792 |
|
792 | |||
793 | $ cd .. |
|
793 | $ cd .. | |
794 |
|
794 | |||
@@ -817,7 +817,7 b' When there is a single closed branch' | |||||
817 | searching for changes |
|
817 | searching for changes | |
818 | abort: push creates new remote branches: foo (1 closed) |
|
818 | abort: push creates new remote branches: foo (1 closed) | |
819 | (use 'hg push --new-branch' to create new remote branches) |
|
819 | (use 'hg push --new-branch' to create new remote branches) | |
820 |
[2 |
|
820 | [20] | |
821 |
|
821 | |||
822 | When there is more than one closed branches |
|
822 | When there is more than one closed branches | |
823 | $ hg -q branch bar |
|
823 | $ hg -q branch bar | |
@@ -830,7 +830,7 b' When there is more than one closed branc' | |||||
830 | searching for changes |
|
830 | searching for changes | |
831 | abort: push creates new remote branches: bar, foo (2 closed) |
|
831 | abort: push creates new remote branches: bar, foo (2 closed) | |
832 | (use 'hg push --new-branch' to create new remote branches) |
|
832 | (use 'hg push --new-branch' to create new remote branches) | |
833 |
[2 |
|
833 | [20] | |
834 |
|
834 | |||
835 | When there are more than one new branches and not all are closed |
|
835 | When there are more than one new branches and not all are closed | |
836 | $ hg -q branch bar1 |
|
836 | $ hg -q branch bar1 | |
@@ -842,6 +842,6 b' When there are more than one new branche' | |||||
842 | searching for changes |
|
842 | searching for changes | |
843 | abort: push creates new remote branches: bar, bar1, foo (2 closed) |
|
843 | abort: push creates new remote branches: bar, bar1, foo (2 closed) | |
844 | (use 'hg push --new-branch' to create new remote branches) |
|
844 | (use 'hg push --new-branch' to create new remote branches) | |
845 |
[2 |
|
845 | [20] | |
846 |
|
846 | |||
847 | $ cd .. |
|
847 | $ cd .. |
@@ -387,7 +387,7 b' Test `commands.push.require-revs`' | |||||
387 | searching for changes |
|
387 | searching for changes | |
388 | abort: push creates new remote head [0-9a-f]+ (re) |
|
388 | abort: push creates new remote head [0-9a-f]+ (re) | |
389 | (merge or see 'hg help push' for details about pushing new heads) |
|
389 | (merge or see 'hg help push' for details about pushing new heads) | |
390 |
[2 |
|
390 | [20] | |
391 | (demonstrate that even though we don't have anything to exchange, we're still |
|
391 | (demonstrate that even though we don't have anything to exchange, we're still | |
392 | showing the error) |
|
392 | showing the error) | |
393 | $ hg push |
|
393 | $ hg push |
@@ -287,7 +287,7 b' Local is superset:' | |||||
287 | searching for changes |
|
287 | searching for changes | |
288 | abort: push creates new remote branches: both, name1 |
|
288 | abort: push creates new remote branches: both, name1 | |
289 | (use 'hg push --new-branch' to create new remote branches) |
|
289 | (use 'hg push --new-branch' to create new remote branches) | |
290 |
[2 |
|
290 | [20] | |
291 | $ hg push $remote --new-branch |
|
291 | $ hg push $remote --new-branch | |
292 | pushing to http://localhost:$HGPORT/ |
|
292 | pushing to http://localhost:$HGPORT/ | |
293 | searching for changes |
|
293 | searching for changes |
@@ -271,7 +271,7 b' Local is superset:' | |||||
271 | searching for changes |
|
271 | searching for changes | |
272 | abort: push creates new remote branches: both, name1 |
|
272 | abort: push creates new remote branches: both, name1 | |
273 | (use 'hg push --new-branch' to create new remote branches) |
|
273 | (use 'hg push --new-branch' to create new remote branches) | |
274 |
[2 |
|
274 | [20] | |
275 | $ hg push $remote --new-branch |
|
275 | $ hg push $remote --new-branch | |
276 | pushing to http://localhost:$HGPORT/ |
|
276 | pushing to http://localhost:$HGPORT/ | |
277 | searching for changes |
|
277 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now