facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 17:27:53 +03:00
Code Issues Projects Releases Wiki Activity

mononoke: test rebases over a merge commit

Browse Source 
Summary:
Are we sure we're prohibiting rebases over the merge commit in a public
history?

Reviewed By: lukaspiatkowski

Differential Revision: D13802865

fbshipit-source-id: d9556ea0616825f82d1f781c4e57bc01a5c5a0b0
This commit is contained in:
Kostia Balytskyi 2019-02-06 14:28:55 -08:00 committed by Facebook Github Bot
parent f8c4fc8ed2
commit 52d5b5d52b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/test-pushrebase.t
View File

@ -242,3 +242,17 @@ Push a merge commit with both parents not ancestors of destination bookmark
|
o A [public;rev=0;426bada5c675]
Push-Rebase over merge is not allowed
$ hgmn up 11 -q
$ echo 8 > 8 && hg add 8 && hg ci -m 8
$ hgmn push -r . --to master_bookmark
remote: * DEBG Session with Mononoke started with uuid: * (glob)
pushing rev e0f0824ca6a6 to destination ssh://user@dummy/repo bookmark master_bookmark
searching for changes
remote: * ERRO Command failed, remote: true, error: pushrebase failed RebaseOverMerge, root_cause: ErrorMessage { (glob)
remote: msg: "pushrebase failed RebaseOverMerge"
remote: }, backtrace: , session_uuid: * (glob)
abort: stream ended unexpectedly (got 0 bytes, expected 4)
[255]
$ hgmn up master_bookmark -q