##// 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:

r45090:d31d1c06 default
r45156:e89b3603 default
Show More
Cargo.toml
40 lines | 777 B | text/plain | TOMLLexer
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307 [package]
name = "hg-core"
version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"]
description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)"
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 edition = "2018"
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
r44786 build = "build.rs"
Georges Racinet
rust: pure Rust lazyancestors iterator...
r40307
[lib]
name = "hg"
Georges Racinet
rust: translated random test of missingancestors...
r41841
Raphaël Gomès
rust-dirstate: add rust implementation of `parse_dirstate` and `pack_dirstate`...
r42488 [dependencies]
Raphaël Gomès
rust: update all dependencies...
r45090 byteorder = "1.3.4"
hex = "0.4.2"
lazy_static = "1.4.0"
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
r44786 libc = { version = "0.2.66", optional = true }
Raphaël Gomès
rust: update all dependencies...
r45090 memchr = "2.3.3"
rand = "0.7.3"
rand_pcg = "0.2.1"
rand_distr = "0.2.2"
Raphaël Gomès
rust-dependencies: update rayon...
r44618 rayon = "1.3.0"
Raphaël Gomès
rust: update all dependencies...
r45090 regex = "1.3.6"
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 twox-hash = "1.5.0"
Raphaël Gomès
rust-utils: add util for canonical path...
r44783 same-file = "1.0.6"
Raphaël Gomès
rust-status: traverse working directory in parallel...
r45026 crossbeam = "0.7.3"
Raphaël Gomès
rust: update micro-timer dependency...
r45089 micro-timer = "0.2.1"
Raphaël Gomès
rust: add logging utils...
r45027 log = "0.4.8"
Raphaël Gomès
rust-pathauditor: add Rust implementation of the `pathauditor`...
r44737
[dev-dependencies]
Georges Racinet
rust-nodemap: pure Rust example...
r44870 clap = "*"
memmap = "0.7.0"
pretty_assertions = "0.6.1"
Raphaël Gomès
rust-hg-path: add useful methods to `HgPath`...
r44738 tempfile = "3.1.0"
Raphaël Gomès
rust-re2: add wrapper for calling Re2 from Rust...
r44786
[build-dependencies]
cc = { version = "1.0.48", optional = true }
[features]
default = []
with-re2 = ["cc", "libc"]