##// END OF EJS Templates
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

File last commit:

r40323:7623199d default
r45156:e89b3603 default
Show More
Cargo.toml
20 lines | 501 B | application/toml | TOMLLexer
[package]
name = "chg"
version = "0.1.0"
authors = ["Yuya Nishihara <yuya@tcha.org>"]
description = "Client for Mercurial command server with cHg extension"
license = "GPL-2.0+"
[dependencies]
bytes = "0.4"
futures = "0.1"
libc = "0.2"
log = { version = "0.4", features = ["std"] }
tokio = "0.1"
tokio-hglib = "0.2"
# TODO: "^0.2.3" once released. we need AsRawFd support.
tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }
tokio-timer = "0.2"
[build-dependencies]
cc = "1.0"