Show More
@@ -399,12 +399,12 b' def checkheads(pushop):' | |||||
399 | closedbranches.add(tag) |
|
399 | closedbranches.add(tag) | |
400 | closedbranches = closedbranches & set(newbranches) |
|
400 | closedbranches = closedbranches & set(newbranches) | |
401 | if closedbranches: |
|
401 | if closedbranches: | |
402 |
errmsg = _(b"push creates new remote branches: %s (%d closed) |
|
402 | errmsg = _(b"push creates new remote branches: %s (%d closed)") % ( | |
403 | branchnames, |
|
403 | branchnames, | |
404 | len(closedbranches), |
|
404 | len(closedbranches), | |
405 | ) |
|
405 | ) | |
406 | else: |
|
406 | else: | |
407 |
errmsg = _(b"push creates new remote branches: %s |
|
407 | errmsg = _(b"push creates new remote branches: %s") % branchnames | |
408 | hint = _(b"use 'hg push --new-branch' to create new remote branches") |
|
408 | hint = _(b"use 'hg push --new-branch' to create new remote branches") | |
409 | raise error.Abort(errmsg, hint=hint) |
|
409 | raise error.Abort(errmsg, hint=hint) | |
410 |
|
410 | |||
@@ -469,15 +469,15 b' def checkheads(pushop):' | |||||
469 | if errormsg is None: |
|
469 | if errormsg is None: | |
470 | if branch not in (b'default', None): |
|
470 | if branch not in (b'default', None): | |
471 | errormsg = _( |
|
471 | errormsg = _( | |
472 |
b"push creates new remote head %s on branch '%s' |
|
472 | b"push creates new remote head %s on branch '%s'" | |
473 | ) % (short(dhs[0]), branch,) |
|
473 | ) % (short(dhs[0]), branch,) | |
474 | elif repo[dhs[0]].bookmarks(): |
|
474 | elif repo[dhs[0]].bookmarks(): | |
475 | errormsg = _( |
|
475 | errormsg = _( | |
476 | b"push creates new remote head %s " |
|
476 | b"push creates new remote head %s " | |
477 |
b"with bookmark '%s' |
|
477 | b"with bookmark '%s'" | |
478 | ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) |
|
478 | ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) | |
479 | else: |
|
479 | else: | |
480 |
errormsg = _(b"push creates new remote head %s |
|
480 | errormsg = _(b"push creates new remote head %s") % short( | |
481 | dhs[0] |
|
481 | dhs[0] | |
482 | ) |
|
482 | ) | |
483 | if unsyncedheads: |
|
483 | if unsyncedheads: |
@@ -140,7 +140,7 b' the bookmark should not move if it diver' | |||||
140 | $ cd ../b |
|
140 | $ cd ../b | |
141 | $ # make sure we cannot push after bookmarks diverged |
|
141 | $ # make sure we cannot push after bookmarks diverged | |
142 | $ hg push -B X | grep abort |
|
142 | $ hg push -B X | grep abort | |
143 |
abort: push creates new remote head * with bookmark 'X' |
|
143 | abort: push creates new remote head * with bookmark 'X' (glob) | |
144 | (pull and merge or see 'hg help push' for details about pushing new heads) |
|
144 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
145 | [1] |
|
145 | [1] | |
146 | $ hg pull -u | grep divergent |
|
146 | $ hg pull -u | grep divergent |
@@ -740,7 +740,7 b' diverging a remote bookmark fails' | |||||
740 | $ hg push http://localhost:$HGPORT2/ |
|
740 | $ hg push http://localhost:$HGPORT2/ | |
741 | pushing to http://localhost:$HGPORT2/ |
|
741 | pushing to http://localhost:$HGPORT2/ | |
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 | [255] |
|
745 | [255] | |
746 | $ hg -R ../a book |
|
746 | $ hg -R ../a book | |
@@ -757,7 +757,7 b' Unrelated marker does not alter the deci' | |||||
757 | $ hg push http://localhost:$HGPORT2/ |
|
757 | $ hg push http://localhost:$HGPORT2/ | |
758 | pushing to http://localhost:$HGPORT2/ |
|
758 | pushing to http://localhost:$HGPORT2/ | |
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 | [255] |
|
762 | [255] | |
763 | $ hg -R ../a book |
|
763 | $ hg -R ../a book | |
@@ -1053,7 +1053,7 b' pushing an existing but divergent bookma' | |||||
1053 | pushing to $TESTTMP/addmarks |
|
1053 | pushing to $TESTTMP/addmarks | |
1054 | searching for changes |
|
1054 | searching for changes | |
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 | [255] |
|
1058 | [255] | |
1059 | $ cd ../addmarks |
|
1059 | $ cd ../addmarks |
@@ -199,7 +199,7 b' check it complains about multiple heads' | |||||
199 | $ hg push -R main -r 'desc(A1)' pushdest |
|
199 | $ hg push -R main -r 'desc(A1)' pushdest | |
200 | pushing to pushdest |
|
200 | pushing to pushdest | |
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 | [255] |
|
204 | [255] | |
205 | $ cd .. |
|
205 | $ cd .. |
@@ -95,7 +95,7 b' Abort: old will still be an head because' | |||||
95 | $ hg push |
|
95 | $ hg push | |
96 | pushing to $TESTTMP/remote |
|
96 | pushing to $TESTTMP/remote | |
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 | [255] |
|
100 | [255] | |
101 |
|
101 | |||
@@ -155,7 +155,7 b' Push should abort on new head' | |||||
155 | $ hg push -r 'desc("other")' |
|
155 | $ hg push -r 'desc("other")' | |
156 | pushing to $TESTTMP/remote |
|
156 | pushing to $TESTTMP/remote | |
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 | [255] |
|
160 | [255] | |
161 |
|
161 | |||
@@ -267,7 +267,7 b' We do not have enought data to take the ' | |||||
267 | pushing to $TESTTMP/remote |
|
267 | pushing to $TESTTMP/remote | |
268 | searching for changes |
|
268 | searching for changes | |
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 | [255] |
|
272 | [255] | |
273 |
|
273 | |||
@@ -317,6 +317,6 b' setup' | |||||
317 | $ hg push |
|
317 | $ hg push | |
318 | pushing to $TESTTMP/remote |
|
318 | pushing to $TESTTMP/remote | |
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 | [255] |
|
322 | [255] |
@@ -1015,7 +1015,7 b' appear on the remote side.' | |||||
1015 | $ hg push -r 435b5d83910c ../mu |
|
1015 | $ hg push -r 435b5d83910c ../mu | |
1016 | pushing to ../mu |
|
1016 | pushing to ../mu | |
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 | [255] |
|
1020 | [255] | |
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 |
@@ -87,7 +87,7 b' Actual testing' | |||||
87 | $ hg push -r 'desc("C1")' |
|
87 | $ hg push -r 'desc("C1")' | |
88 | pushing to $TESTTMP/E1/server |
|
88 | pushing to $TESTTMP/E1/server | |
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 | [255] |
|
92 | [255] | |
93 |
|
93 |
@@ -78,7 +78,7 b' Actual testing' | |||||
78 | $ hg push |
|
78 | $ hg push | |
79 | pushing to $TESTTMP/C1/server |
|
79 | pushing to $TESTTMP/C1/server | |
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 | [255] |
|
83 | [255] | |
84 |
|
84 |
@@ -79,7 +79,7 b' Actual testing' | |||||
79 | $ hg push --rev 'desc(A1)' |
|
79 | $ hg push --rev 'desc(A1)' | |
80 | pushing to $TESTTMP/C2/server |
|
80 | pushing to $TESTTMP/C2/server | |
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 | [255] |
|
84 | [255] | |
85 |
|
85 |
@@ -78,7 +78,7 b' Actual testing' | |||||
78 | $ hg push |
|
78 | $ hg push | |
79 | pushing to $TESTTMP/C3/server |
|
79 | pushing to $TESTTMP/C3/server | |
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 | [255] |
|
83 | [255] | |
84 |
|
84 |
@@ -79,7 +79,7 b' Actual testing' | |||||
79 | $ hg push --rev 'desc(C0)' |
|
79 | $ hg push --rev 'desc(C0)' | |
80 | pushing to $TESTTMP/C4/server |
|
80 | pushing to $TESTTMP/C4/server | |
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 | [255] |
|
84 | [255] | |
85 |
|
85 |
@@ -71,7 +71,7 b' Actual testing' | |||||
71 | $ hg push -r 'desc(B0)' |
|
71 | $ hg push -r 'desc(B0)' | |
72 | pushing to $TESTTMP/D1/server |
|
72 | pushing to $TESTTMP/D1/server | |
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 | [255] |
|
76 | [255] | |
77 |
|
77 |
@@ -92,7 +92,7 b' Actual testing' | |||||
92 | $ hg push --rev 'desc(C0)' |
|
92 | $ hg push --rev 'desc(C0)' | |
93 | pushing to $TESTTMP/D2/server |
|
93 | pushing to $TESTTMP/D2/server | |
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 | [255] |
|
97 | [255] | |
98 |
|
98 |
@@ -91,13 +91,13 b' Actual testing' | |||||
91 | $ hg push --rev 'desc(A1)' |
|
91 | $ hg push --rev 'desc(A1)' | |
92 | pushing to $TESTTMP/D3/server |
|
92 | pushing to $TESTTMP/D3/server | |
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 | [255] |
|
96 | [255] | |
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 | [255] |
|
102 | [255] | |
103 |
|
103 | |||
@@ -109,7 +109,7 b' In this case, even a bare push is creati' | |||||
109 | $ hg push |
|
109 | $ hg push | |
110 | pushing to $TESTTMP/D3/server |
|
110 | pushing to $TESTTMP/D3/server | |
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 | [255] |
|
114 | [255] | |
115 |
|
115 |
@@ -109,7 +109,7 b' Actual testing (new branch only)' | |||||
109 | $ hg push --rev 'desc(A1)' |
|
109 | $ hg push --rev 'desc(A1)' | |
110 | pushing to $TESTTMP/D4/server |
|
110 | pushing to $TESTTMP/D4/server | |
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 | [255] |
|
114 | [255] | |
115 |
|
115 |
@@ -98,7 +98,7 b' Actual testing' | |||||
98 | $ hg push --rev 'desc(B1)' |
|
98 | $ hg push --rev 'desc(B1)' | |
99 | pushing to $TESTTMP/D5/server |
|
99 | pushing to $TESTTMP/D5/server | |
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 | [255] |
|
103 | [255] | |
104 | $ hg push --rev 'desc(A1)' |
|
104 | $ hg push --rev 'desc(A1)' |
@@ -79,7 +79,7 b' Actual testing' | |||||
79 | $ hg push --rev 'desc(C0)' |
|
79 | $ hg push --rev 'desc(C0)' | |
80 | pushing to $TESTTMP/D6/server |
|
80 | pushing to $TESTTMP/D6/server | |
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 | [255] |
|
84 | [255] | |
85 |
|
85 |
@@ -31,7 +31,7 b' Specifying a revset that evaluates to nu' | |||||
31 | pushing to ../a |
|
31 | pushing to ../a | |
32 | searching for changes |
|
32 | searching for changes | |
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 | [255] |
|
36 | [255] | |
37 |
|
37 | |||
@@ -49,7 +49,7 b' Specifying a revset that evaluates to nu' | |||||
49 | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a |
|
49 | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | |
50 | new remote heads on branch 'default': |
|
50 | new remote heads on branch 'default': | |
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 | [255] |
|
54 | [255] | |
55 |
|
55 | |||
@@ -66,7 +66,7 b' Specifying a revset that evaluates to nu' | |||||
66 | $ hg push ../a |
|
66 | $ hg push ../a | |
67 | pushing to ../a |
|
67 | pushing to ../a | |
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 | [255] |
|
71 | [255] | |
72 |
|
72 | |||
@@ -119,7 +119,7 b' Specifying a revset that evaluates to nu' | |||||
119 | $ hg push ../c |
|
119 | $ hg push ../c | |
120 | pushing to ../c |
|
120 | pushing to ../c | |
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 | [255] |
|
124 | [255] | |
125 |
|
125 | |||
@@ -132,7 +132,7 b' Specifying a revset that evaluates to nu' | |||||
132 | $ hg push -r 3 ../c |
|
132 | $ hg push -r 3 ../c | |
133 | pushing to ../c |
|
133 | pushing to ../c | |
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 | [255] |
|
137 | [255] | |
138 |
|
138 | |||
@@ -142,7 +142,7 b' Specifying a revset that evaluates to nu' | |||||
142 | new remote heads on branch 'default': |
|
142 | new remote heads on branch 'default': | |
143 | a5dda829a167 |
|
143 | a5dda829a167 | |
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 | [255] |
|
147 | [255] | |
148 |
|
148 | |||
@@ -232,14 +232,14 b' Push on existing branch and new branch:' | |||||
232 | $ hg push ../f |
|
232 | $ hg push ../f | |
233 | pushing to ../f |
|
233 | pushing to ../f | |
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 | [255] |
|
237 | [255] | |
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 | [255] |
|
244 | [255] | |
245 |
|
245 | |||
@@ -253,14 +253,14 b' Multiple new branches:' | |||||
253 | $ hg push ../f |
|
253 | $ hg push ../f | |
254 | pushing to ../f |
|
254 | pushing to ../f | |
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 | [255] |
|
258 | [255] | |
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 | [255] |
|
265 | [255] | |
266 |
|
266 | |||
@@ -276,7 +276,7 b' Fail on multiple head push:' | |||||
276 | $ hg push -r 4 -r 7 ../f |
|
276 | $ hg push -r 4 -r 7 ../f | |
277 | pushing to ../f |
|
277 | pushing to ../f | |
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 | [255] |
|
281 | [255] | |
282 |
|
282 | |||
@@ -353,7 +353,7 b' Failed push of new named branch:' | |||||
353 | $ hg push -r 12 -r 13 ../f |
|
353 | $ hg push -r 12 -r 13 ../f | |
354 | pushing to ../f |
|
354 | pushing to ../f | |
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 | [255] |
|
358 | [255] | |
359 |
|
359 | |||
@@ -425,7 +425,7 b" multiple new heads but also doesn't repo" | |||||
425 | pushing to h |
|
425 | pushing to h | |
426 | searching for changes |
|
426 | searching for changes | |
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 | [255] |
|
430 | [255] | |
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 | |
@@ -433,7 +433,7 b" multiple new heads but also doesn't repo" | |||||
433 | pushing to h |
|
433 | pushing to h | |
434 | searching for changes |
|
434 | searching for changes | |
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 | [255] |
|
438 | [255] | |
439 | $ hg -R i push h -v |
|
439 | $ hg -R i push h -v | |
@@ -442,7 +442,7 b" multiple new heads but also doesn't repo" | |||||
442 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 |
|
442 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | |
443 | new remote heads on branch 'default': |
|
443 | new remote heads on branch 'default': | |
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 | [255] |
|
447 | [255] | |
448 |
|
448 | |||
@@ -477,7 +477,7 b' Check prepush logic with merged branches' | |||||
477 | $ hg -R k push -r a j |
|
477 | $ hg -R k push -r a j | |
478 | pushing to j |
|
478 | pushing to j | |
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 | [255] |
|
482 | [255] | |
483 |
|
483 | |||
@@ -513,7 +513,7 b' Prepush -r should not allow you to sneak' | |||||
513 | $ hg push ../l -b b |
|
513 | $ hg push ../l -b b | |
514 | pushing to ../l |
|
514 | pushing to ../l | |
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 | [255] |
|
518 | [255] | |
519 |
|
519 | |||
@@ -763,14 +763,14 b' outgoing:' | |||||
763 | $ hg push inner |
|
763 | $ hg push inner | |
764 | pushing to inner |
|
764 | pushing to inner | |
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 | [255] |
|
768 | [255] | |
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 | [255] |
|
775 | [255] | |
776 |
|
776 | |||
@@ -786,7 +786,7 b' Test fail hook' | |||||
786 | pushing to inner |
|
786 | pushing to inner | |
787 | searching for changes |
|
787 | searching for changes | |
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 | [255] |
|
791 | [255] | |
792 |
|
792 | |||
@@ -815,7 +815,7 b' When there is a single closed branch' | |||||
815 | $ hg push ../x |
|
815 | $ hg push ../x | |
816 | pushing to ../x |
|
816 | pushing to ../x | |
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 | [255] |
|
820 | [255] | |
821 |
|
821 | |||
@@ -828,7 +828,7 b' When there is more than one closed branc' | |||||
828 | $ hg push ../x |
|
828 | $ hg push ../x | |
829 | pushing to ../x |
|
829 | pushing to ../x | |
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 | [255] |
|
833 | [255] | |
834 |
|
834 | |||
@@ -840,7 +840,7 b' When there are more than one new branche' | |||||
840 | $ hg push ../x |
|
840 | $ hg push ../x | |
841 | pushing to ../x |
|
841 | pushing to ../x | |
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 | [255] |
|
845 | [255] | |
846 |
|
846 |
@@ -385,7 +385,7 b' Test `commands.push.require-revs`' | |||||
385 | $ hg push -b default |
|
385 | $ hg push -b default | |
386 | pushing to $TESTTMP/test-require-revs-dest |
|
386 | pushing to $TESTTMP/test-require-revs-dest | |
387 | searching for changes |
|
387 | searching for changes | |
388 |
abort: push creates new remote head [0-9a-f]+ |
|
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 | [255] |
|
390 | [255] | |
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 |
@@ -571,7 +571,7 b' push -f' | |||||
571 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
|
571 | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss | |
572 | pushing subrepo s to $TESTTMP/t/s |
|
572 | pushing subrepo s to $TESTTMP/t/s | |
573 | searching for changes |
|
573 | searching for changes | |
574 |
abort: push creates new remote head 12a213df6fa9 |
|
574 | abort: push creates new remote head 12a213df6fa9 (in subrepository "s") | |
575 | (merge or see 'hg help push' for details about pushing new heads) |
|
575 | (merge or see 'hg help push' for details about pushing new heads) | |
576 | [255] |
|
576 | [255] | |
577 | $ hg push -f |
|
577 | $ hg push -f | |
@@ -1013,7 +1013,7 b' Issue1977: multirepo push should fail if' | |||||
1013 | created new head |
|
1013 | created new head | |
1014 | $ hg -R repo2 ci -m3 |
|
1014 | $ hg -R repo2 ci -m3 | |
1015 | $ hg -q -R repo2 push |
|
1015 | $ hg -q -R repo2 push | |
1016 |
abort: push creates new remote head cc505f09a8b2 |
|
1016 | abort: push creates new remote head cc505f09a8b2 (in subrepository "s") | |
1017 | (merge or see 'hg help push' for details about pushing new heads) |
|
1017 | (merge or see 'hg help push' for details about pushing new heads) | |
1018 | [255] |
|
1018 | [255] | |
1019 | $ hg -R repo update |
|
1019 | $ hg -R repo update |
@@ -285,7 +285,7 b' Local is superset:' | |||||
285 | $ hg push $remote |
|
285 | $ hg push $remote | |
286 | pushing to http://localhost:$HGPORT/ |
|
286 | pushing to http://localhost:$HGPORT/ | |
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 | [255] |
|
290 | [255] | |
291 | $ hg push $remote --new-branch |
|
291 | $ hg push $remote --new-branch |
@@ -269,7 +269,7 b' Local is superset:' | |||||
269 | $ hg push $remote |
|
269 | $ hg push $remote | |
270 | pushing to http://localhost:$HGPORT/ |
|
270 | pushing to http://localhost:$HGPORT/ | |
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 | [255] |
|
274 | [255] | |
275 | $ hg push $remote --new-branch |
|
275 | $ hg push $remote --new-branch |
General Comments 0
You need to be logged in to leave comments.
Login now