##// END OF EJS Templates
merge: don't auto-pick destination with `hg merge 'wdir()'`...
merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

File last commit:

r43583:8d432d3a default
r44638:1850066f default
Show More
Cargo.toml
29 lines | 716 B | application/toml | TOMLLexer
[package]
name = "hg-cpython"
version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"]
edition = "2018"
[lib]
name='rusthg'
crate-type = ["cdylib"]
[features]
default = ["python27"]
# Features to build an extension module:
python27 = ["cpython/python27-sys", "cpython/extension-module-2-7"]
python3 = ["cpython/python3-sys", "cpython/extension-module"]
# Enable one of these features to build a test executable linked to libpython:
# e.g. cargo test --no-default-features --features python27-bin
python27-bin = ["cpython/python27-sys"]
python3-bin = ["cpython/python3-sys"]
[dependencies]
hg-core = { path = "../hg-core" }
libc = '*'
[dependencies.cpython]
version = "0.3"
default-features = false