##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: demonstrate how continuing rebase after upgrade can result in merge...
tests: demonstrate how continuing rebase after upgrade can result in merge If the user starts a rebase with an hg version before 9c9cfecd4600 (rebase: don't use rebased node as dirstate p2 (BC), 2020-01-10) and then runs into conflicts, they will be dropped out to the shell with the rebased node set as the dirstate's second parent. If they then upgrade to a later hg version, it will respect the dirstate's parents and will create a merge commit even if the user was rebasing a non-merge commit. Differential Revision: https://phab.mercurial-scm.org/D8355
Martin von Zweigbergk -
r45156:e89b3603 default
Show More
Name Size Modified Last Commit Author
/ rust / hg-cpython / src
dirstate
ancestors.rs Loading ...
cindex.rs Loading ...
conversion.rs Loading ...
dagops.rs Loading ...
debug.rs Loading ...
dirstate.rs Loading ...
discovery.rs Loading ...
exceptions.rs Loading ...
lib.rs Loading ...
parsers.rs Loading ...
ref_sharing.rs Loading ...
revlog.rs Loading ...
utils.rs Loading ...