| 2018-08-02 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-07-31 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
file |
diff |
annotate
|
| 2018-06-14 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| 2018-06-13 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
file |
diff |
annotate
|
| 2018-06-12 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
| 2018-06-11 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
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-06-04 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
file |
diff |
annotate
|
| 2018-04-23 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
file |
diff |
annotate
|
| 2018-05-22 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
file |
diff |
annotate
|
| 2018-05-21 |
Boris Feld |
test: update to new outputs
|
file |
diff |
annotate
|
| 2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
file |
diff |
annotate
|
| 2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
file |
diff |
annotate
|
| 2018-04-29 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
file |
diff |
annotate
|
| 2018-04-29 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
file |
diff |
annotate
|
| 2018-04-29 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
file |
diff |
annotate
|
| 2018-04-25 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
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-28 |
Pulkit Goyal |
evolve: show a message when evolution leads to no changes to commit
|
file |
diff |
annotate
|
| 2018-03-23 |
Pulkit Goyal |
evolve: use the new rebased changeset to resolve phase-divergence
|
file |
diff |
annotate
|
| 2018-03-23 |
Pulkit Goyal |
tests: add one more test case about handling of phase-divergence by evolve
|
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-12 |
Martin von Zweigbergk |
evolve: include "operation" metadata in obsmarkers
|
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
|