A Scalable, User-Friendly Source Control System.
Go to file
Mark Thomas 013aa19333 mutation: don't allow divergence when rebasing
Summary:
In general, mutation tracking doesn't care about divergence.  However, in the
case of rebase, it doesn't make sense to allow divergence to occur if we can
avoid it by omitting some of the commits to rebase.

This makes rebase behaviour more like old obsmarker-based behaviour.  This
breaks a test for mutation copying markers, so update those to use metaedit,
which has the copying behaviour for both obsmarkers and mutation.  At some
point we should make rebase behave better in these cases.

Reviewed By: quark-zju

Differential Revision: D17136480

fbshipit-source-id: 9e465b7fc8bda33e7a746e4df68410713e2be37e
2019-09-02 03:13:51 -07:00
contrib chg: remove hashstate and validation logic 2019-08-28 19:26:26 -07:00
distutils_rust rust: set linker on linux to ld.gold 2019-08-26 12:30:36 -07:00
doc doc: remove unused doc build step 2019-05-14 15:09:42 -07:00
edenscm mutation: don't allow divergence when rebasing 2019-09-02 03:13:51 -07:00
edenscmnative setup: move native extensions to edenscmnative 2019-06-19 17:55:49 -07:00
exec Update to syn 1.0 and structopt 0.3 2019-08-30 21:43:53 -07:00
i18n ui: add labelled prefixes to ui.write 2019-05-09 06:55:11 -07:00
lib revisionstore: impl IterableStore for IndexedLogHistoryStore 2019-08-30 18:30:47 -07:00
newdoc doc: update WritingNativeCommands 2019-08-28 19:26:28 -07:00
slides slides: recompile with newer tex toolchain 2019-04-18 13:50:03 -07:00
tests mutation: don't allow divergence when rebasing 2019-09-02 03:13:51 -07:00
.editorconfig move scm/hg/.clang-format to scm/hg/mercurial/ 2018-05-25 14:35:51 -07:00
.flake8 codemod: join the auto-formatter party 2018-05-25 22:17:29 -07:00
.gitignore setup: move native extensions to edenscmnative 2019-06-19 17:55:49 -07:00
.hgsigs Added signature for changeset f51ae48a3fd9 2017-12-01 13:49:47 -06:00
.jshintrc hgweb: add .jshintrc with some basic rules 2017-11-22 22:18:06 +08:00
CONTRIBUTING contributing: add new file with a pointer to the wiki 2016-10-08 10:39:00 -04:00
CONTRIBUTORS Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
COPYING COPYING: refresh with current address from fsf.org 2011-06-02 11:17:02 -05:00
gen_version.py generate __version__.py during the buck build 2018-06-25 15:52:25 -07:00
hgeditor spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
hgweb.cgi codemod: import from the edenscm package 2019-01-29 17:25:32 -08:00
Makefile makefile: remove 'hg version' invocation in make local 2019-08-28 13:54:57 -07:00
README.rst doc: rename README to README.rst 2017-09-26 08:37:17 +02:00
setup.py lib: remove cargo workspace 2019-08-26 17:34:34 -07:00

Mercurial
=========

Mercurial is a fast, easy to use, distributed revision control tool
for software developers.

Basic install::

 $ make            # see install targets
 $ make install    # do a system-wide install
 $ hg debuginstall # sanity-check setup
 $ hg              # see help

Running without installing::

 $ make local      # build for inplace usage
 $ ./hg --version  # should show the latest version

See https://mercurial-scm.org/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.