| 2018-08-18 |
Pulkit Goyal |
evolve: set the second parent if we get conflicts while evolving
stable
|
file |
diff |
annotate
|
| 2018-08-02 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-08-02 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-06-14 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| 2018-06-12 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
| 2018-06-10 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
file |
diff |
annotate
|
| 2018-06-05 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
file |
diff |
annotate
|
| 2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-04-22 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
file |
diff |
annotate
|
| 2018-03-21 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| 2018-03-21 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-03-21 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-03-13 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
file |
diff |
annotate
|
| 2018-01-28 |
Pulkit Goyal |
evolve: show the updated working directory after `hg evolve --continue`
|
file |
diff |
annotate
|
| 2018-01-27 |
Pulkit Goyal |
evolve: add evolve info to cmdutil.afterresolvedstates
|
file |
diff |
annotate
|
| 2018-01-16 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| 2018-01-16 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-01-16 |
Pierre-Yves David |
branching: merge stable back into default
|
file |
diff |
annotate
|
| 2018-01-15 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
file |
diff |
annotate
|
| 2018-01-06 |
Pulkit Goyal |
evolve: don't use graftstate for continuing `hg evolve`
|
file |
diff |
annotate
|
| 2018-01-05 |
Boris Feld |
test: update output to 9b3f95d9783d
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge future 6.7.0 in mercurial-4.0 branch
mercurial-4.0
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge future 6.7.0 in mercurial-4.2 branch
mercurial-4.2
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge future 6.7.0 in mercurial-4.3 branch
mercurial-4.3
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
obsfate: re-enables operation display in obsfate
stable
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge with mercurial-4.1 branch
mercurial-4.0
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge with mercurial-4.3 branch
mercurial-4.2
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: revert output changes from phase renaming
mercurial-4.3
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: revert output changes related to temporary amend commit
mercurial-4.3
|
file |
diff |
annotate
|