mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
A Scalable, User-Friendly Source Control System.
88d034ad12
Summary: If pushrebase is asked to rebase a commit where the p2-parent is the route to the commit onto which the rebase is being made, then it is supposed to flip the parents. This is what ensures that the changes from the server-only commits are not lost. This doesn't work. In this test, the "other" file, created on the server, is lost in the final merged commit. Test Plan: Added a test which demonstrates a failure. Reviewers: quark, #mercurial Reviewed By: quark Subscribers: quark Differential Revision: https://phabricator.intern.facebook.com/D6709096 Signature: 6709096:1515794007:0908765c24b18a7dcaf3672953e816095b0acf68 |
||
|---|---|---|
| .cargo | ||
| contrib | ||
| distutils_rust | ||
| doc | ||
| hgdemandimport | ||
| hgext | ||
| hgext3rd | ||
| hgsubversion | ||
| i18n | ||
| lib | ||
| lz4revlog | ||
| mercurial | ||
| tests | ||
| .clang-format | ||
| .editorconfig | ||
| .hg-vendored-crates | ||
| .hgignore | ||
| .hgsigs | ||
| .jshintrc | ||
| CONTRIBUTING | ||
| CONTRIBUTORS | ||
| COPYING | ||
| 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.