Show More
@@ -401,7 +401,7 b' def checkheads(pushop):' | |||||
401 | errormsg = (_("push creates new branch '%s' " |
|
401 | errormsg = (_("push creates new branch '%s' " | |
402 | "with multiple heads") % (branch)) |
|
402 | "with multiple heads") % (branch)) | |
403 | hint = _("merge or" |
|
403 | hint = _("merge or" | |
404 |
" see |
|
404 | " see 'hg help push' for details about" | |
405 | " pushing new heads") |
|
405 | " pushing new heads") | |
406 | elif len(newhs) > len(oldhs): |
|
406 | elif len(newhs) > len(oldhs): | |
407 | # remove bookmarked or existing remote heads from the new heads list |
|
407 | # remove bookmarked or existing remote heads from the new heads list | |
@@ -420,11 +420,11 b' def checkheads(pushop):' | |||||
420 | ) % short(dhs[0]) |
|
420 | ) % short(dhs[0]) | |
421 | if unsyncedheads: |
|
421 | if unsyncedheads: | |
422 | hint = _("pull and merge or" |
|
422 | hint = _("pull and merge or" | |
423 |
" see |
|
423 | " see 'hg help push' for details about" | |
424 | " pushing new heads") |
|
424 | " pushing new heads") | |
425 | else: |
|
425 | else: | |
426 | hint = _("merge or" |
|
426 | hint = _("merge or" | |
427 |
" see |
|
427 | " see 'hg help push' for details about" | |
428 | " pushing new heads") |
|
428 | " pushing new heads") | |
429 | if branch is None: |
|
429 | if branch is None: | |
430 | repo.ui.note(_("new remote heads:\n")) |
|
430 | repo.ui.note(_("new remote heads:\n")) |
@@ -427,7 +427,7 b' diverging a remote bookmark fails' | |||||
427 | pushing to http://localhost:$HGPORT2/ |
|
427 | pushing to http://localhost:$HGPORT2/ | |
428 | searching for changes |
|
428 | searching for changes | |
429 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
|
429 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! | |
430 |
(merge or see |
|
430 | (merge or see 'hg help push' for details about pushing new heads) | |
431 | [255] |
|
431 | [255] | |
432 | $ hg -R ../a book |
|
432 | $ hg -R ../a book | |
433 | @ 1:0d2164f0ce0d |
|
433 | @ 1:0d2164f0ce0d | |
@@ -443,7 +443,7 b' Unrelated marker does not alter the deci' | |||||
443 | pushing to http://localhost:$HGPORT2/ |
|
443 | pushing to http://localhost:$HGPORT2/ | |
444 | searching for changes |
|
444 | searching for changes | |
445 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! |
|
445 | abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! | |
446 |
(merge or see |
|
446 | (merge or see 'hg help push' for details about pushing new heads) | |
447 | [255] |
|
447 | [255] | |
448 | $ hg -R ../a book |
|
448 | $ hg -R ../a book | |
449 | @ 1:0d2164f0ce0d |
|
449 | @ 1:0d2164f0ce0d | |
@@ -733,7 +733,7 b' pushing an existing but divergent bookma' | |||||
733 | searching for changes |
|
733 | searching for changes | |
734 | remote has heads on branch 'default' that are not known locally: a2a606d9ff1b |
|
734 | remote has heads on branch 'default' that are not known locally: a2a606d9ff1b | |
735 | abort: push creates new remote head 54694f811df9 with bookmark 'X'! |
|
735 | abort: push creates new remote head 54694f811df9 with bookmark 'X'! | |
736 |
(pull and merge or see |
|
736 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
737 | [255] |
|
737 | [255] | |
738 | $ cd ../addmarks |
|
738 | $ cd ../addmarks | |
739 |
|
739 |
@@ -93,7 +93,7 b' Abort: old will still be an head because' | |||||
93 | pushing to $TESTTMP/remote (glob) |
|
93 | pushing to $TESTTMP/remote (glob) | |
94 | searching for changes |
|
94 | searching for changes | |
95 | abort: push creates new remote head 71e3228bffe1! |
|
95 | abort: push creates new remote head 71e3228bffe1! | |
96 |
(merge or see |
|
96 | (merge or see 'hg help push' for details about pushing new heads) | |
97 | [255] |
|
97 | [255] | |
98 |
|
98 | |||
99 | old head is now public (public remote version) |
|
99 | old head is now public (public remote version) | |
@@ -153,7 +153,7 b' Push should abort on new head' | |||||
153 | pushing to $TESTTMP/remote (glob) |
|
153 | pushing to $TESTTMP/remote (glob) | |
154 | searching for changes |
|
154 | searching for changes | |
155 | abort: push creates new remote head d7d41ccbd4de! |
|
155 | abort: push creates new remote head d7d41ccbd4de! | |
156 |
(merge or see |
|
156 | (merge or see 'hg help push' for details about pushing new heads) | |
157 | [255] |
|
157 | [255] | |
158 |
|
158 | |||
159 |
|
159 |
@@ -920,7 +920,7 b' appear on the remote side.' | |||||
920 | pushing to ../mu |
|
920 | pushing to ../mu | |
921 | searching for changes |
|
921 | searching for changes | |
922 | abort: push creates new remote head 435b5d83910c! |
|
922 | abort: push creates new remote head 435b5d83910c! | |
923 |
(merge or see |
|
923 | (merge or see 'hg help push' for details about pushing new heads) | |
924 | [255] |
|
924 | [255] | |
925 | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head |
|
925 | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head | |
926 | pushing to ../mu |
|
926 | pushing to ../mu |
@@ -32,7 +32,7 b' Specifying a revset that evaluates to nu' | |||||
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 |
|
35 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
36 | [255] |
|
36 | [255] | |
37 |
|
37 | |||
38 | $ hg push --debug ../a |
|
38 | $ hg push --debug ../a | |
@@ -50,7 +50,7 b' Specifying a revset that evaluates to nu' | |||||
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 |
|
53 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
54 | [255] |
|
54 | [255] | |
55 |
|
55 | |||
56 | $ hg pull ../a |
|
56 | $ hg pull ../a | |
@@ -66,7 +66,7 b' Specifying a revset that evaluates to nu' | |||||
66 | pushing to ../a |
|
66 | pushing to ../a | |
67 | searching for changes |
|
67 | searching for changes | |
68 | abort: push creates new remote head 1e108cc5548c! |
|
68 | abort: push creates new remote head 1e108cc5548c! | |
69 |
(merge or see |
|
69 | (merge or see 'hg help push' for details about pushing new heads) | |
70 | [255] |
|
70 | [255] | |
71 |
|
71 | |||
72 | $ hg merge |
|
72 | $ hg merge | |
@@ -119,7 +119,7 b' Specifying a revset that evaluates to nu' | |||||
119 | pushing to ../c |
|
119 | pushing to ../c | |
120 | searching for changes |
|
120 | searching for changes | |
121 | abort: push creates new remote head 6346d66eb9f5! |
|
121 | abort: push creates new remote head 6346d66eb9f5! | |
122 |
(merge or see |
|
122 | (merge or see 'hg help push' for details about pushing new heads) | |
123 | [255] |
|
123 | [255] | |
124 |
|
124 | |||
125 | $ hg push -r 2 ../c |
|
125 | $ hg push -r 2 ../c | |
@@ -132,7 +132,7 b' Specifying a revset that evaluates to nu' | |||||
132 | pushing to ../c |
|
132 | pushing to ../c | |
133 | searching for changes |
|
133 | searching for changes | |
134 | abort: push creates new remote head a5dda829a167! |
|
134 | abort: push creates new remote head a5dda829a167! | |
135 |
(merge or see |
|
135 | (merge or see 'hg help push' for details about pushing new heads) | |
136 | [255] |
|
136 | [255] | |
137 |
|
137 | |||
138 | $ hg push -v -r 3 -r 4 ../c |
|
138 | $ hg push -v -r 3 -r 4 ../c | |
@@ -142,7 +142,7 b' Specifying a revset that evaluates to nu' | |||||
142 | a5dda829a167 |
|
142 | a5dda829a167 | |
143 | ee8fbc7a0295 |
|
143 | ee8fbc7a0295 | |
144 | abort: push creates new remote head a5dda829a167! |
|
144 | abort: push creates new remote head a5dda829a167! | |
145 |
(merge or see |
|
145 | (merge or see 'hg help push' for details about pushing new heads) | |
146 | [255] |
|
146 | [255] | |
147 |
|
147 | |||
148 | $ hg push -v -f -r 3 -r 4 ../c |
|
148 | $ hg push -v -f -r 3 -r 4 ../c | |
@@ -276,7 +276,7 b' Fail on multiple head push:' | |||||
276 | pushing to ../f |
|
276 | pushing to ../f | |
277 | searching for changes |
|
277 | searching for changes | |
278 | abort: push creates new remote head 0b715ef6ff8f on branch 'a'! |
|
278 | abort: push creates new remote head 0b715ef6ff8f on branch 'a'! | |
279 |
(merge or see |
|
279 | (merge or see 'hg help push' for details about pushing new heads) | |
280 | [255] |
|
280 | [255] | |
281 |
|
281 | |||
282 | Push replacement head on existing branches: |
|
282 | Push replacement head on existing branches: | |
@@ -381,7 +381,7 b' Pushing multi headed new branch:' | |||||
381 | pushing to ../f |
|
381 | pushing to ../f | |
382 | searching for changes |
|
382 | searching for changes | |
383 | abort: push creates new branch 'f' with multiple heads |
|
383 | abort: push creates new branch 'f' with multiple heads | |
384 |
(merge or see |
|
384 | (merge or see 'hg help push' for details about pushing new heads) | |
385 | [255] |
|
385 | [255] | |
386 | $ hg push --branch f --new-branch --force ../f |
|
386 | $ hg push --branch f --new-branch --force ../f | |
387 | pushing to ../f |
|
387 | pushing to ../f | |
@@ -425,7 +425,7 b" multiple new heads but also doesn't repo" | |||||
425 | searching for changes |
|
425 | searching for changes | |
426 | remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 |
|
426 | remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | |
427 | abort: push creates new remote head 97bd0c84d346! |
|
427 | abort: push creates new remote head 97bd0c84d346! | |
428 |
(pull and merge or see |
|
428 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
429 | [255] |
|
429 | [255] | |
430 | $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx |
|
430 | $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx | |
431 | $ hg -R i push h |
|
431 | $ hg -R i push h | |
@@ -433,7 +433,7 b" multiple new heads but also doesn't repo" | |||||
433 | searching for changes |
|
433 | searching for changes | |
434 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others |
|
434 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others | |
435 | abort: push creates new remote head 97bd0c84d346! |
|
435 | abort: push creates new remote head 97bd0c84d346! | |
436 |
(pull and merge or see |
|
436 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
437 | [255] |
|
437 | [255] | |
438 | $ hg -R i push h -v |
|
438 | $ hg -R i push h -v | |
439 | pushing to h |
|
439 | pushing to h | |
@@ -442,7 +442,7 b" multiple new heads but also doesn't repo" | |||||
442 | new remote heads on branch 'default': |
|
442 | new remote heads on branch 'default': | |
443 | 97bd0c84d346 |
|
443 | 97bd0c84d346 | |
444 | abort: push creates new remote head 97bd0c84d346! |
|
444 | abort: push creates new remote head 97bd0c84d346! | |
445 |
(pull and merge or see |
|
445 | (pull and merge or see 'hg help push' for details about pushing new heads) | |
446 | [255] |
|
446 | [255] | |
447 |
|
447 | |||
448 |
|
448 | |||
@@ -513,7 +513,7 b' Prepush -r should not allow you to sneak' | |||||
513 | pushing to ../l |
|
513 | pushing to ../l | |
514 | searching for changes |
|
514 | searching for changes | |
515 | abort: push creates new remote head 451211cc22b0 on branch 'a'! |
|
515 | abort: push creates new remote head 451211cc22b0 on branch 'a'! | |
516 |
(merge or see |
|
516 | (merge or see 'hg help push' for details about pushing new heads) | |
517 | [255] |
|
517 | [255] | |
518 |
|
518 | |||
519 | $ cd .. |
|
519 | $ cd .. | |
@@ -763,14 +763,14 b' outgoing:' | |||||
763 | pushing to inner |
|
763 | pushing to inner | |
764 | searching for changes |
|
764 | searching for changes | |
765 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! |
|
765 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | |
766 |
(merge or see |
|
766 | (merge or see 'hg help push' for details about pushing new heads) | |
767 | [255] |
|
767 | [255] | |
768 |
|
768 | |||
769 | $ hg push inner -r4 -r5 |
|
769 | $ hg push inner -r4 -r5 | |
770 | pushing to inner |
|
770 | pushing to inner | |
771 | searching for changes |
|
771 | searching for changes | |
772 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! |
|
772 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | |
773 |
(merge or see |
|
773 | (merge or see 'hg help push' for details about pushing new heads) | |
774 | [255] |
|
774 | [255] | |
775 |
|
775 | |||
776 | $ hg in inner |
|
776 | $ hg in inner | |
@@ -786,7 +786,7 b' Test fail hook' | |||||
786 | searching for changes |
|
786 | searching for changes | |
787 | running fail-push hook |
|
787 | running fail-push hook | |
788 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! |
|
788 | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | |
789 |
(merge or see |
|
789 | (merge or see 'hg help push' for details about pushing new heads) | |
790 | [255] |
|
790 | [255] | |
791 |
|
791 | |||
792 | $ cd .. |
|
792 | $ cd .. |
@@ -516,7 +516,7 b' push -f' | |||||
516 | pushing subrepo s to $TESTTMP/t/s |
|
516 | pushing subrepo s to $TESTTMP/t/s | |
517 | searching for changes |
|
517 | searching for changes | |
518 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
|
518 | abort: push creates new remote head 12a213df6fa9! (in subrepo s) | |
519 |
(merge or see |
|
519 | (merge or see 'hg help push' for details about pushing new heads) | |
520 | [255] |
|
520 | [255] | |
521 | $ hg push -f |
|
521 | $ hg push -f | |
522 | pushing to $TESTTMP/t (glob) |
|
522 | pushing to $TESTTMP/t (glob) | |
@@ -952,7 +952,7 b' Issue1977: multirepo push should fail if' | |||||
952 | $ hg -R repo2 ci -m3 |
|
952 | $ hg -R repo2 ci -m3 | |
953 | $ hg -q -R repo2 push |
|
953 | $ hg -q -R repo2 push | |
954 | abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
|
954 | abort: push creates new remote head cc505f09a8b2! (in subrepo s) | |
955 |
(merge or see |
|
955 | (merge or see 'hg help push' for details about pushing new heads) | |
956 | [255] |
|
956 | [255] | |
957 | $ hg -R repo update |
|
957 | $ hg -R repo update | |
958 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
958 | 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