facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
26,414 Commits 24 Branches 62 Tags 320 MiB
Rust 45.1%
Python 20.7%
C++ 10.5%
Perl 9.1%
TypeScript 7.3%
Other 7.1%
c97c4cf7f6
Go to file
Siddharth Agarwal c97c4cf7f6 merge.mergestate: perform all premerges before any merges (BC) 
We perform all that we can non-interactively before prompting the user for input
via their merge tool. This allows for a maximally consistent state when the user
is first prompted.

The test output changes indicate the actual behavior change happening.
2015-10-11 21:56:39 -07:00
contrib check-code: detect and ban 'util.Abort' 2015-10-08 12:53:09 -07:00
doc urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
hgext filemerge: introduce a premerge flag and function 2015-10-11 20:47:04 -07:00
i18n merge with stable 2015-10-01 12:17:46 -05:00
mercurial merge.mergestate: perform all premerges before any merges (BC) 2015-10-11 21:56:39 -07:00
tests merge.mergestate: perform all premerges before any merges (BC) 2015-10-11 21:56:39 -07:00
.hgignore hgignore: ignore the PyCharm workspace folder 2014-10-13 11:46:04 +02:00
.hgsigs Added signature for changeset f41404cf41e2 2015-10-01 12:07:20 -05: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: add support for HGUNICODEPEDANTRY environment variable 2014-06-23 09:33:07 -04:00
hgeditor Fixed a bashism with the use of $RANDOM in hgeditor. 2010-05-19 18:06:35 +02:00
hgweb.cgi urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
Makefile makefile: add wheel build target 2015-10-09 12:30:46 -05:00
README urls: bulk-change primary website URLs 2015-09-30 15:43:49 -05:00
setup.py setup: import setup from setuptools if FORCE_SETUPTOOLS is set 2015-10-09 12:25:51 -05:00

README 

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.