facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
21,841 Commits 24 Branches 62 Tags 322 MiB
Rust 45.1%
Python 20.7%
C++ 10.5%
Perl 9.1%
TypeScript 7.3%
Other 7.1%
af05e75b06
Go to file
Mads Kiilerich af05e75b06 changectx: ancestor should only prefer merge.preferancestor if it is a revision 
The value '*' currently designates that bid merge should be used. The best
way to test bid merge is to set preferancestor=* in the configuration file ...
but then it would abort with unknown revision '*' when other code paths ended
up in changectx.ancestor .

Instead, just skip and ignore the value '*' when looking for a preferred
ancestor.
2014-08-15 02:46:44 +02:00
contrib revset: optimize baseset.__sub__ (issue4313) 2014-07-24 12:12:12 -07:00
doc gendoc: restore use of callable() since it was readded in Python 3.2 2014-06-23 09:23:57 -04:00
hgext largefiles: don't override matchandpats for always matchers (issue4334) 2014-08-13 15:51:33 -07:00
i18n i18n-ru: fix RST breakage spotted by test-gendoc 2014-08-09 16:04:36 -05:00
mercurial changectx: ancestor should only prefer merge.preferancestor if it is a revision 2014-08-15 02:46:44 +02:00
tests changectx: ancestor should only prefer merge.preferancestor if it is a revision 2014-08-15 02:46:44 +02:00
.hgignore contrib/vagrant: use Vagrant for running tests on virtual machine 2014-07-05 16:32:28 +03:00
.hgsigs Added signature for changeset 58a23aedff03 2014-08-01 18:23:18 -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 mq: add a warning about uncommitted changes for qfinish 2011-11-10 15:40:34 -06:00
Makefile buildrpm: remove prompt for uncommitted changes - it was a bad idea 2014-05-15 01:48:37 +02:00
README readme: mention how to run in-place 2012-03-02 21:43:55 +02:00
setup.py Merge with stable. 2014-07-06 15:39:01 -04: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 http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.