Read about our upcoming Code of Conduct on this issue

rebase: clear merge state when aborting in-memory merge on dirty working copy

Differential Revision: https://phab.mercurial-scm.org/D9509

--HG--
branch : stable
36 jobs for 5.6.1 in 43 minutes and 42 seconds (queued for 7 minutes and 40 seconds)
latest
Status Name Job ID Coverage
  Test
passed checks-py2 #129007

00:03:56

passed checks-py3 #129043

00:03:01

passed rust-cargo-test-py2 #129044

00:01:59

passed rust-cargo-test-py3 #129045

00:01:20

passed rust-cargo-test-py3-dirstate-tree #129046

00:01:08

passed test-py2 #129047

00:24:39

passed test-py2-chg #129052

00:23:59

passed test-py2-pure #129048

00:24:39

passed test-py2-rust #129050

00:23:57

passed test-py3 #129017

00:15:08

passed test-py3-pure #129049

00:11:35

passed test-py3-rust #129021

00:12:51

passed test-py3-rust-dirstate-tree #129051

00:17:08

failed checks-py2 #128976

00:00:14

failed checks-py3 #129009

00:00:14

failed checks-py3 #128977

00:00:14

failed rust-cargo-test-py2 #129011

00:00:15

failed rust-cargo-test-py2 #128978

00:00:14

failed rust-cargo-test-py3 #129013

00:00:15

failed rust-cargo-test-py3 #128979

00:00:14

failed rust-cargo-test-py3-dirstate-tree #129015

00:00:14

failed rust-cargo-test-py3-dirstate-tree #128980

00:00:15

failed test-py2 #129016

00:00:14

failed test-py2 #128981

00:00:14

failed test-py2-chg #129023

00:00:16

failed test-py2-chg #128988

00:00:16

failed test-py2-pure #129018

00:00:14

failed test-py2-pure #128983

00:00:14

failed test-py2-rust #129020

00:00:15

failed test-py2-rust #128985

00:00:14

failed test-py3 #128982

00:00:14

failed test-py3-pure #129019

00:00:14

failed test-py3-pure #128984

00:00:14

failed test-py3-rust #128986

00:00:14

failed test-py3-rust-dirstate-tree #129022

00:00:15

failed test-py3-rust-dirstate-tree #128987

00:00:16