mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 17:58:27 +03:00
A Scalable, User-Friendly Source Control System.
da0b66a8ec
Summary: This solves an issue vipannalla saw that the heuristics logic behaves incorrectly when running `hg up -C c4a88583; hg graft 23001ead`. The file `great_persons_on_ex_civilization-inl.h` would be marked as "unresolved" and removed from the working copy potentially due to other mergedriver actions, while it should be merged cleanly and do not appear in mergestate at all. After debugging, the file was only renamed on one side, and not changed on the other side. In the heuristics code path, the file was reported as copied and confused the callsite. Reviewed By: singhsrb Differential Revision: D14195031 fbshipit-source-id: 0602fd56b75219f851c0175debfe72c4d49d652d |
||
|---|---|---|
| contrib | ||
| distutils_rust | ||
| doc | ||
| edenscm | ||
| exec | ||
| i18n | ||
| lib | ||
| newdoc | ||
| slides | ||
| tests | ||
| .editorconfig | ||
| .flake8 | ||
| .gitignore | ||
| .hgsigs | ||
| .jshintrc | ||
| CONTRIBUTING | ||
| CONTRIBUTORS | ||
| COPYING | ||
| gen_version.py | ||
| hg | ||
| hgeditor | ||
| hgweb.cgi | ||
| Makefile | ||
| README.rst | ||
| setup.py | ||
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.