facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
29,535 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%
1b7185f6d1
Go to file
Simon Farnsworth 1b7185f6d1 merge: always use other, not remote, in user prompts 
Now that we store and display merge labels in user prompts (not just
conflict markets), we should rely on labels to clarify the two sides of a
merge operation (hg merge, hg update, hg rebase etc).

"remote" is not a great name here, as it conflates "remote" as in "remote
server" with "remote" as in "the side of the merge that's further away". In
cases where you're merging the "wrong way" around, remote can even be the
"local" commit that you're merging with something pulled from the remote
server.
2016-08-12 05:56:40 -07:00
contrib py3: make check-py3-compat.py use correct module name at loading pure modules 2016-08-09 02:28:34 +09:00
doc doc: remove double imports of inspect from hgmanpage.py 2016-05-14 14:37:25 +09:00
hgext journal: use the dirstate parentchange callbacks 2016-08-09 09:15:46 -07:00
hgext3rd extensions: also search for extension in the 'hgext3rd' package 2016-03-11 10:30:08 +00:00
i18n i18n: use inspect.getsourcelines() to obtain lineno from func or class 2016-07-27 21:53:14 +09:00
mercurial merge: always use other, not remote, in user prompts 2016-08-12 05:56:40 -07:00
tests merge: always use other, not remote, in user prompts 2016-08-12 05:56:40 -07: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 f19241339f58 2016-08-01 12:37:25 -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_osutil_cffi.py osutil: add darwin-only version of os.listdir using cffi 2016-07-11 11:05:08 +02:00
setup.py mpatch: write a cffi version of mpatch.patches 2016-07-25 15:10:52 +02: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.