Mercurial > hg
changeset 45225:fc751824ae97 stable
push: another test for checks preventing pushing orphaness to a server
In this one, orphan was create with and amend instead of a prune.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 23 Jul 2020 16:26:29 +0200 |
| parents | 187cc478e18f |
| children | 5ff77aaba1e4 |
| files | tests/test-obsolete-check-push.t |
| diffstat | 1 files changed, 58 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete-check-push.t Thu Jul 23 16:23:43 2020 +0200 +++ b/tests/test-obsolete-check-push.t Thu Jul 23 16:26:29 2020 +0200 @@ -121,3 +121,61 @@ [255] $ cd ../.. + + +Orphan from superseding +----------------------- + +Setup + + $ cp -R base check-superseded + $ cd check-superseded/client + $ hg up 'desc("commit_A0_")' + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg branch other + marked working directory as branch other + $ hg commit --amend -m commit_A1_ + 1 new orphan changesets + $ hg log -G + @ changeset: 4:df9b82a99e21 + | branch: other + | tag: tip + | parent: 0:1e4be0697311 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: commit_A1_ + | + | o changeset: 3:16affbe0f986 + |/ branch: unrelated + | parent: 0:1e4be0697311 + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: unrelated + | + | * changeset: 2:c09d8ab29fda + | | user: test + | | date: Thu Jan 01 00:00:00 1970 +0000 + | | instability: orphan + | | summary: commit_B0_ + | | + | x changeset: 1:37624bf21024 + |/ user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | obsolete: rewritten using amend as 4:df9b82a99e21 + | summary: commit_A0_ + | + o changeset: 0:1e4be0697311 + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: root + + +Pushing the result is prevented with a message + + $ hg push --new-branch + pushing to $TESTTMP/check-superseded/server + searching for changes + abort: push includes orphan changeset: c09d8ab29fda! + [255] + + $ cd ../..