A Scalable, User-Friendly Source Control System.
Go to file
Gábor Stefanik 912f58ada1 mergecopies: add logic to process incomplete data
We first combine incomplete copies on the two sides of the topological CA
into complete copies.
Any leftover incomplete copies are then combined with the incomplete
divergences to reconstruct divergences spanning over the topological CA.
Finally we promote any divergences falsely flagged as incomplete to full
divergences.

Right now, there is nothing generating incomplete copy/divergence data,
so this code does nothing. Changes to _checkcopies to populate these
dicts are coming later in this series.
2016-10-04 12:51:54 +02:00
contrib bashcompletion: allow skipping completion for 'hg status' 2016-09-26 10:47:37 +02:00
doc hgmanpage: stop using raw-unicode strings 2016-10-07 07:43:04 -04:00
hgext util: increase filechunkiter size to 128k 2016-10-14 01:53:15 +02:00
hgext3rd extensions: also search for extension in the 'hgext3rd' package 2016-03-11 10:30:08 +00:00
i18n i18n-pt_BR: synchronized with 9c29cf2af0ce 2016-08-31 13:58:33 -03:00
mercurial mergecopies: add logic to process incomplete data 2016-10-04 12:51:54 +02:00
tests checkcopies: handle divergences contained entirely in tca::ctx 2016-10-12 11:54:03 +02:00
.editorconfig mercurial: add editorconfig 2016-04-05 18:10:33 +01:00
.hgignore make: turn ubuntu docker into template 2016-04-26 23:33:17 -07:00
.hgsigs Added signature for changeset 6c105ed84c14 2016-10-01 15:00:23 -04: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
hg hg: disable demandimport for py3 2016-05-11 23:24:41 +00:00
hgeditor spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
hgweb.cgi urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
Makefile make: introduce a target to clean everything but packages 2016-07-29 00:39:59 +02:00
README urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
setup_bdiff_cffi.py bdiff: implement cffi version of blocks 2016-07-28 14:17:08 +02:00
setup_mpatch_cffi.py mpatch: add setup_mpatch_cffi.py 2016-08-28 17:51:32 -07:00
setup_osutil_cffi.py osutil: add darwin-only version of os.listdir using cffi 2016-07-11 11:05:08 +02:00
setup.py osutil: add darwin-only version of os.listdir using cffi 2016-07-11 11:05:08 +02: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.