##// END OF EJS Templates
rebase: don't create merge when continuing rebase interrupted by old hg...
rebase: don't create merge when continuing rebase interrupted by old hg This fixes the bug described and demonstrated in the previous commit. It does so by practically undoing 8082a77cc3a2 (rebase: remove some redundant setting of dirstate parents, 2020-01-10). Differential Revision: https://phab.mercurial-scm.org/D8356

File last commit:

r40323:7623199d default
r45157:e7af56a0 default
Show More
Cargo.toml
20 lines | 501 B | text/plain | TOMLLexer
Yuya Nishihara
rust-chg: add project skeleton...
r40003 [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"
Yuya Nishihara
rust-chg: depend on log and tokio_timer...
r40323 log = { version = "0.4", features = ["std"] }
Yuya Nishihara
rust-chg: add project skeleton...
r40003 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" }
Yuya Nishihara
rust-chg: depend on log and tokio_timer...
r40323 tokio-timer = "0.2"
Yuya Nishihara
rust-chg: add project skeleton...
r40003
[build-dependencies]
cc = "1.0"