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.
5,200 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%
671f6fd2a7
Go to file
Brendan Cully 671f6fd2a7 imerge: fix ancestor calculation 
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.

This patch also handles the ParseError move from cmdutil to dispatch.
2007-08-23 19:51:59 -07:00
contrib Enable demandimport only in scripts, not in importable modules (issue605) 2007-08-18 11:37:08 +02:00
doc gendoc: use demandimport 2007-08-20 21:10:45 -05:00
hgext imerge: fix ancestor calculation 2007-08-23 19:51:59 -07:00
mercurial Merge with crew-stable 2007-08-23 12:24:54 -07:00
templates gitweb: add notfound template 2007-07-05 19:47:04 -07:00
tests merge: forcefully mark files that we get from the second parent as dirty 2007-08-23 01:48:29 -03:00
.hgignore Ignore mergebackup files generated by mpatch 2007-07-26 13:38:20 -07:00
.hgsigs Added signature for changeset e64b8d651071183a358d6f98136eb08450366023 2007-06-25 21:23:24 -05:00
CONTRIBUTORS Add self to contributors 2006-08-18 15:03:16 -07:00
COPYING Add COPYING 2005-06-17 09:32:13 -08:00
hg Enable demandimport only in scripts, not in importable modules (issue605) 2007-08-18 11:37:08 +02:00
hgeditor hgeditor: Use $HG to run 'hg diff' (see 9779a8c8d672) 2007-06-23 20:22:17 +02:00
hgmerge Use smerge minor mode in emacs to resolve conflicts. 2007-08-15 17:27:51 +02:00
hgweb.cgi Enable demandimport only in scripts, not in importable modules (issue605) 2007-08-18 11:37:08 +02:00
hgwebdir.cgi Enable demandimport only in scripts, not in importable modules (issue605) 2007-08-18 11:37:08 +02:00
Makefile Makefile: remove *.pyd files on "make clean". 2007-06-25 14:46:20 +02:00
README Move README info to wiki 2006-12-19 17:17:08 -06:00
setup.py Enable demandimport only in scripts, not in importable modules (issue605) 2007-08-18 11:37:08 +02:00

README 

Basic install:

 $ make            # see install targets
 $ make install    # do a system-wide install
 $ hg debuginstall # sanity-check setup
 $ hg              # see help

See http://www.selenic.com/mercurial/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.