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

r44786:d8d4fa9a default
r45156:e89b3603 default
Show More
build.rs
25 lines | 548 B | application/rls-services+xml | RustLexer
// build.rs
//
// Copyright 2020 Raphaël Gomès <rgomes@octobus.net>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
#[cfg(feature = "with-re2")]
use cc;
#[cfg(feature = "with-re2")]
fn compile_re2() {
cc::Build::new()
.cpp(true)
.flag("-std=c++11")
.file("src/re2/rust_re2.cpp")
.compile("librustre.a");
println!("cargo:rustc-link-lib=re2");
}
fn main() {
#[cfg(feature = "with-re2")]
compile_re2();
}