| 2019-06-06 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
file |
diff |
annotate
|
| 2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2019-04-24 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
file |
diff |
annotate
|
| 2019-01-22 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-08-21 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-08-21 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 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-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 |
branching: merge stable back into default
|
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-15 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
file |
diff |
annotate
|
| 2018-01-11 |
Pulkit Goyal |
evolve: use better words in conflict markers of `hg evolve`
|
file |
diff |
annotate
|
| 2018-01-11 |
Pulkit Goyal |
tests: add a test demonstrating we still use graft in conflict markers
|
file |
diff |
annotate
|
| 2018-01-09 |
Pulkit Goyal |
evolve: use phases.new-commit config to retain phase information (issue5720)
|
file |
diff |
annotate
|
| 2018-01-09 |
Pulkit Goyal |
tests: add a test demonstarting lose of phase in `hg evolve`
|
file |
diff |
annotate
|