2019-07-11 |
Taapas Agrawal |
abort: added support for evolve to hg abort
|
file |
diff |
annotate
|
2019-07-29 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
file |
diff |
annotate
|
2019-06-08 |
Anton Shestakov |
evolve: correct action verb in a message
|
file |
diff |
annotate
|
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-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
file |
diff |
annotate
|
2019-04-25 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
file |
diff |
annotate
|
2019-04-13 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
file |
diff |
annotate
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
2019-04-20 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
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-12-04 |
Pierre-Yves David |
test: adapt to change output change 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-09-21 |
Sushil khanchi |
evovle: remove redundancy in evolve output
|
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-20 |
Pulkit Goyal |
evolve: delete evolvestate after aborting interrupted `next --evolve`
stable
|
file |
diff |
annotate
|
2018-08-20 |
Pulkit Goyal |
tests: check that we delete evolvestate correctly after abort/stop
stable
|
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-18 |
Pulkit Goyal |
tests: demonstrate the interrupted evolve does not set p2
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-05 |
Pulkit Goyal |
evolve: show unfinished information in `hg status -v` (issue5886)
|
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-05 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
| base
|
2018-05-22 |
Pulkit Goyal |
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
|
file |
diff |
annotate
| base
|