mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
A Scalable, User-Friendly Source Control System.
942cefafa6
With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the patch parents and "parents" the resulting commit parents, the current behaviour is: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 [wp1, wp2]/buggy 0 1 0 [p1] 0 1 1 [p1, p2] 1 0 0 [wp1, wp2] 1 0 1 [p1, p2] 1 1 0 [p1] 1 1 1 [p1, p2] The original behaviour before 1f543fd375c5 was: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 if p1 == wp1 then [p1, p2] otherwise [wp1, wp2] 0 1 0 [p1] 0 1 1 [p1, p2] This patch restores the previous behaviour when --bypass is not set, and align --bypass behaviour when --exact is not set with merge diffs. |
||
|---|---|---|
| contrib | ||
| doc | ||
| hgext | ||
| i18n | ||
| mercurial | ||
| tests | ||
| .hgignore | ||
| .hgsigs | ||
| CONTRIBUTORS | ||
| COPYING | ||
| hg | ||
| hgeditor | ||
| hgweb.cgi | ||
| Makefile | ||
| README | ||
| 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 See http://mercurial.selenic.com/ for detailed installation instructions, platform-specific notes, and Mercurial user information.