graft-state: save --base in graft's state, fixing bug with graft --continue
Without this change, running graft --continue after grafting a merge commit using --base
(and encountering conflicts) will output "skipping ungraftable merge revision" even though
we specified a base in the initial graft command.
Graft's improve behaviour is reflected in test-graft.t.
Differential Revision: https://phab.mercurial-scm.org/D8578
# -*- mode: ruby -*-
Vagrant.configure('2') do |config|
# Debian 10.1 x86_64 without configuration management software
config.vm.box = "debian/buster64"
config.vm.hostname = "tests"
config.vm.define "tests" do |conf|
conf.vm.provision :file, source: "run-tests.sh", destination:"run-tests.sh"
conf.vm.provision :shell, path: "provision.sh"
conf.vm.synced_folder "../..", "/hgshared"
end
end