mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
A Scalable, User-Friendly Source Control System.
73bdc48646
This bug happens if the filesystem doesn't support exec-bit, during merges, for example in 0b01431fee25 on the hg repo. If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is based on p1, and the FS doesn't support the exec-bit, the dirstate can't "guess" the right bit. We instead fix it in workingcontext.flags()/manifest. |
||
---|---|---|
contrib | ||
doc | ||
hgext | ||
i18n | ||
mercurial | ||
tests | ||
.hgignore | ||
.hgsigs | ||
CONTRIBUTORS | ||
COPYING | ||
hg | ||
hgeditor | ||
hgweb.cgi | ||
hgwebdir.cgi | ||
Makefile | ||
README | ||
setup.py |
Basic install: $ make # see install targets $ make install # do a system-wide install $ hg debuginstall # sanity-check setup $ hg # see help See http://mercurial.selenic.com/ for detailed installation instructions, platform-specific notes, and Mercurial user information.