facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
16,556 Commits 25 Branches 62 Tags 325 MiB
Rust 45.1%
Python 20.7%
C++ 10.5%
Perl 9.1%
TypeScript 7.3%
Other 7.1%
7714ac81fa
Go to file
Yuya Nishihara 7714ac81fa graft: don't drop the second parent on unsuccessful merge (issue3498) 
This replicates the strategy of rebase, which postpones setparents and
duplicatecopies after checking the merge stats.

Without the second parent, resolve cannot redo merge.
2012-06-16 17:05:55 +09:00
contrib hg-ssh: exit with 255 instead of -1 on error 2012-05-07 00:52:08 +02:00
doc build: fix hgrc manpage building with docutils 0.9 2012-05-08 23:59:39 +04:00
hgext rebase: improve error message on improper phases 2012-06-18 11:16:24 +02:00
i18n i18n-pt_BR: synchronized with 9e1c386d48be 2012-06-22 10:19:56 -03:00
mercurial graft: don't drop the second parent on unsuccessful merge (issue3498) 2012-06-16 17:05:55 +09:00
tests graft: don't drop the second parent on unsuccessful merge (issue3498) 2012-06-16 17:05:55 +09:00
.hgignore update .hgignore for hackable with Python 2.7 2012-04-28 01:22:35 +02:00
.hgsigs Added signature for changeset a1e1826de33a 2012-06-01 23:48:27 -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 rename util.set_binary to setbinary 2011-05-06 15:25:35 +02: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 Makefile: remove generated mercurial/__version__.py 2012-05-15 12:44:07 +02:00
README readme: mention how to run in-place 2012-03-02 21:43:55 +02:00
setup.py plan9: initial support for plan 9 from bell labs 2012-04-08 12:43:41 -07: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.