2018-10-17 |
Pierre-Yves David |
branching: preserve the expected output on default
|
file |
diff |
annotate
|
2018-10-12 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
2018-10-12 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
2018-10-12 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2018-10-12 |
Pierre-Yves David |
test: backed out test output changes from changeset ef22eef37ecc
stable
|
file |
diff |
annotate
|
2018-09-12 |
Pierre-Yves David |
test: update output to match new "pull" phase report
|
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-07-31 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
file |
diff |
annotate
|
2018-07-31 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
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-12 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
2018-06-10 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
file |
diff |
annotate
|
2018-06-02 |
Pulkit Goyal |
corecompat: update the tests output to show phase update summary
|
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 |
tests: add test about handling phase-divergent merges
|
file |
diff |
annotate
|
2018-03-28 |
Pulkit Goyal |
tests: add more tests for solving phase-divergence using `hg evolve`
|
file |
diff |
annotate
|
2018-03-24 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
file |
diff |
annotate
|
2018-03-24 |
Pulkit Goyal |
evolve: move logic to complete interrupted orphan resolution to new fn
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
evolve: write data to evolvestate in case on conflicts in phase-divergence
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
tests: add tests of content+parent change creating phase-divergence
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
tests: show first line of commit message in test-evolve-phase-divergence.t
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
evolve: make sure bookmarks are moved after phase-divergence resolution
|
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-23 |
Pulkit Goyal |
tests: add more tests for handling of phase divergence by `hg evolve`
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
tests: temporary delete the merge test of handling phase divergence
|
file |
diff |
annotate
|
2018-03-30 |
Pulkit Goyal |
tests: various comment on test-evolve-phase-divergence
|
file |
diff |
annotate
|
2018-03-30 |
Pulkit Goyal |
tests: make test-evolve-phase-divergence more descriptive
|
file |
diff |
annotate
|
2018-03-23 |
Pulkit Goyal |
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
|
file |
diff |
annotate
| base
|