Mercurial > evolve
changeset 5751:73cb6cafc930 mercurial-5.6
tests: back out changeset 77b184ee60b5
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:39 +0800 |
| parents | ded843f23065 |
| children | 347924bf3c0d |
| files | tests/test-exchange-obsmarkers-case-A3.t tests/test-minitopic.t tests/test-push-checkheads-mixed-branch-topic-G3.t tests/test-push-checkheads-multi-topics-F3.t tests/test-push-checkheads-multibranches-E3.t tests/test-push-checkheads-partial-C1.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C3.t tests/test-push-checkheads-partial-C4.t tests/test-push-checkheads-unpushed-D1.t tests/test-push-checkheads-unpushed-D2.t tests/test-push-checkheads-unpushed-D3.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-push-checkheads-unpushed-D6.t tests/test-sharing.t tests/test-topic-flow-publish-flag.t tests/test-topic-push.t tests/test-topic-tutorial.t |
| diffstat | 19 files changed, 31 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-exchange-obsmarkers-case-A3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-exchange-obsmarkers-case-A3.t Thu Jan 28 18:48:39 2021 +0800 @@ -231,7 +231,7 @@ searching for changes abort: push creates new remote head e5ea8f9c7314 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd .. test obsmarkers exchange.
--- a/tests/test-minitopic.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-minitopic.t Thu Jan 28 18:48:39 2021 +0800 @@ -87,13 +87,13 @@ searching for changes abort: push creates new remote head 22c9514ed811 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes abort: push creates new remote head 22c9514ed811 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort default 0ab6d544d0efd629fda056601cfe95e73d1af210 @@ -153,7 +153,7 @@ searching for changes abort: push creates new remote head f31af349535e (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push enabled pushing to http://localhost:$HGPORT/ searching for changes @@ -222,7 +222,7 @@ searching for changes abort: push creates new remote head 82c5842e0472 on branch 'default:topic_A' (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push disabled pushing to http://localhost:$HGPORT2/ searching for changes
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t Thu Jan 28 18:48:39 2021 +0800 @@ -92,6 +92,6 @@ searching for changes abort: push creates new remote head dc44c53142f0 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-multi-topics-F3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-multi-topics-F3.t Thu Jan 28 18:48:39 2021 +0800 @@ -96,6 +96,6 @@ searching for changes abort: push creates new remote head 57530ca5eb24 on branch 'default:Y' (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-multibranches-E3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-multibranches-E3.t Thu Jan 28 18:48:39 2021 +0800 @@ -92,6 +92,6 @@ searching for changes abort: push creates new remote head dc44c53142f0 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C1.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-partial-C1.t Thu Jan 28 18:48:39 2021 +0800 @@ -79,4 +79,4 @@ searching for changes abort: push creates new remote head 25c56d33e4c4 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255]
--- a/tests/test-push-checkheads-partial-C2.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-partial-C2.t Thu Jan 28 18:48:39 2021 +0800 @@ -81,6 +81,6 @@ searching for changes abort: push creates new remote head f6082bc4ffef (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-partial-C3.t Thu Jan 28 18:48:39 2021 +0800 @@ -80,6 +80,6 @@ searching for changes abort: push creates new remote head 0f88766e02d6 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-partial-C4.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-partial-C4.t Thu Jan 28 18:48:39 2021 +0800 @@ -81,6 +81,6 @@ searching for changes abort: push creates new remote head 0f88766e02d6 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D1.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D1.t Thu Jan 28 18:48:39 2021 +0800 @@ -73,7 +73,7 @@ searching for changes abort: push creates new remote head 74ff5441d343 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D2.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D2.t Thu Jan 28 18:48:39 2021 +0800 @@ -94,6 +94,6 @@ searching for changes abort: push creates new remote head 0f88766e02d6 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D3.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D3.t Thu Jan 28 18:48:39 2021 +0800 @@ -93,13 +93,13 @@ searching for changes abort: push creates new remote head f6082bc4ffef (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push --rev 'desc(B1)' pushing to $TESTTMP/D3/server (glob) searching for changes abort: push creates new remote head 25c56d33e4c4 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Extra testing ------------- @@ -111,6 +111,6 @@ searching for changes abort: push creates new remote head 25c56d33e4c4 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-push-checkheads-unpushed-D4.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D4.t Thu Jan 28 18:48:39 2021 +0800 @@ -111,7 +111,7 @@ searching for changes abort: push creates new remote head f6082bc4ffef (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Actual testing (existing branch only) ------------------------------------
--- a/tests/test-push-checkheads-unpushed-D5.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D5.t Thu Jan 28 18:48:39 2021 +0800 @@ -100,7 +100,7 @@ searching for changes abort: push creates new remote head 25c56d33e4c4 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg push --rev 'desc(A1)' pushing to $TESTTMP/D5/server (glob) searching for changes
--- a/tests/test-push-checkheads-unpushed-D6.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-push-checkheads-unpushed-D6.t Thu Jan 28 18:48:39 2021 +0800 @@ -81,6 +81,6 @@ searching for changes abort: push creates new remote head 0f88766e02d6 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ cd ../..
--- a/tests/test-sharing.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-sharing.t Thu Jan 28 18:48:39 2021 +0800 @@ -347,7 +347,7 @@ remote has heads on branch 'default' that are not known locally: 9d21d673314a abort: push creates new remote head 3363442626b3 with bookmark 'bug15' (pull and merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg pull ../public pulling from ../public searching for changes
--- a/tests/test-topic-flow-publish-flag.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-topic-flow-publish-flag.t Thu Jan 28 18:48:39 2021 +0800 @@ -396,7 +396,7 @@ searching for changes abort: push creates new remote head 4dcd0be9db96 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}' @ 14:4dcd0be9db96 c_dN0 draft default topic_B |
--- a/tests/test-topic-push.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-topic-push.t Thu Jan 28 18:48:39 2021 +0800 @@ -83,7 +83,7 @@ searching for changes abort: push creates new remote head 9fe81b7f425d (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg outgoing -r 'desc(CB)' -G comparing with $TESTTMP/main (glob) searching for changes @@ -113,7 +113,7 @@ searching for changes abort: push creates new remote branches: mountain (use 'hg push --new-branch' to create new remote branches) - [20] + [255] $ hg push --new-branch pushing to $TESTTMP/main (glob) searching for changes @@ -256,7 +256,7 @@ searching for changes abort: push creates new remote head 67f579af159d (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 4 default babar draft CD | @@ -302,7 +302,7 @@ searching for changes abort: push creates new remote head 84eaf32db6c3 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 5 default celeste draft CE | @@ -344,7 +344,7 @@ searching for changes abort: push creates new remote head 67f579af159d (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] $ hg log -G @ 5 default celeste draft CE | @@ -386,7 +386,7 @@ searching for changes abort: push creates new remote head f0bc62a661be on branch 'default:babar' (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Multiple heads on a branch merged into a topic branch ----------------------------------------------------- @@ -430,7 +430,7 @@ searching for changes abort: push creates new remote head 4937c4cad39e (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Reject when pushing to publishing
--- a/tests/test-topic-tutorial.t Thu Jan 28 18:48:38 2021 +0800 +++ b/tests/test-topic-tutorial.t Thu Jan 28 18:48:39 2021 +0800 @@ -1079,7 +1079,7 @@ searching for changes abort: push creates new remote head 70dfa201ed73 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Even after a rebase, pushing all active topics at the same time would publish @@ -1099,7 +1099,7 @@ searching for changes abort: push creates new remote head 4cd7c1591a67 (merge or see 'hg help push' for details about pushing new heads) - [20] + [255] Publishing only one of them is allowed (as long as it does not create a new branch head as we just saw in the previous case):