mirror of
https://github.com/facebook/sapling.git
synced 2025-01-06 04:43:19 +03:00
A Scalable, User-Friendly Source Control System.
0be0108bed
Summary: I was thinking about what we need to enable automatic restacking on non-conflicting amends (see the next diff), but I realized the --tool :abort tool I implemented in D8493065 doesn't really work well for this for three reasons: - It can't handle the case of mergedriver having to run, which is the other reason we'd have to break out of IMM. - It hard-codes the merge tool. The user might want to specify another tool that doesn't recreate conflicts or solves them differently. - It'd force callers to detect if IMM will be used (to prevent an on-disk merge hapening by mistake). A flag can implement this much more easily. - As I learned when writing D8493065, it would require hardcoded logic in every command anyway to support the non-IMM case. (Just raising an abort will leave most commands with an interrupted state.) So, I think we should replace it with this flag to make auto-restacking work very reliably (we could add it to graft, too). If there was some big demand for --tool :abort we could always add it back in the future. Reviewed By: quark-zju Differential Revision: D8701897 fbshipit-source-id: ea3b92d0a224a8ce43edb120b53bec241d92a61d |
||
|---|---|---|
| .cargo | ||
| contrib | ||
| distutils_rust | ||
| doc | ||
| exec/scm_daemon | ||
| hgdemandimport | ||
| hgext | ||
| hgext3rd | ||
| i18n | ||
| lib | ||
| mercurial | ||
| tests | ||
| .editorconfig | ||
| .flake8 | ||
| .gitignore | ||
| .hg-vendored-crates | ||
| .hgsigs | ||
| .jshintrc | ||
| .watchmanconfig | ||
| 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.