| 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
|
| 2018-01-27 |
Pulkit Goyal |
evolve: add evolve info to cmdutil.afterresolvedstates
|
file |
diff |
annotate
|
| 2018-01-11 |
Pulkit Goyal |
grab: add a command to grab a commit and update to it
|
file |
diff |
annotate
|
| 2018-01-20 |
Pierre-Yves David |
test: update with new 'update' hint about obsfate
|
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-15 |
Pierre-Yves David |
branching: backed out test output changes from core-02fdb8c018aa
stable
|
file |
diff |
annotate
|
| 2018-01-06 |
Pulkit Goyal |
evolve: don't use graftstate for continuing `hg evolve`
|
file |
diff |
annotate
|
| 2018-01-05 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
file |
diff |
annotate
|
| 2017-12-09 |
Pulkit Goyal |
evolve: use compat.TROUBLES to show troubles in user interface
|
file |
diff |
annotate
|
| 2018-01-05 |
Boris Feld |
test: update output to 02fdb8c018aa
|
file |
diff |
annotate
|
| 2018-01-05 |
Boris Feld |
test: update output to 9b3f95d9783d
|
file |
diff |
annotate
|
| 2017-11-01 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2017-10-26 |
Pierre-Yves David |
evolve: rename --phasedivergent flag to --phase-divergent
|
file |
diff |
annotate
|
| 2017-10-26 |
Pierre-Yves David |
evolve: rename --contentdivergent flag to --content-divergent
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
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
|
| 2017-09-27 |
Pierre-Yves David |
packaging: merge stable back into default
|
file |
diff |
annotate
|
| 2017-09-26 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 3.9 compat branch
mercurial-3.9
|
file |
diff |
annotate
|
| 2017-09-26 |
Pierre-Yves David |
branching: merge future 6.7.0 in the stable branch
stable
|
file |
diff |
annotate
|
| 2017-09-15 |
Boris Feld |
tests: update after removing of redundant amend commit
|
file |
diff |
annotate
|
| 2017-08-24 |
Martin von Zweigbergk |
messages: use hyphenated '{phase,content}-divergent' in user messages
|
file |
diff |
annotate
|
| 2017-08-24 |
Boris Feld |
warning: rename warning message
|
file |
diff |
annotate
|
| 2017-08-24 |
Boris Feld |
warning: rename bumped warning message
|
file |
diff |
annotate
|
| 2017-08-24 |
Boris Feld |
warning: rename unstable warning message
|
file |
diff |
annotate
|
| 2017-08-11 |
Boris Feld |
revset: divergent() is deprecated
|
file |
diff |
annotate
|
| 2017-08-11 |
Boris Feld |
revset: unstable() is deprecated
|
file |
diff |
annotate
|
| 2017-08-10 |
Boris Feld |
log: bumped was renamed into phasedivergent
|
file |
diff |
annotate
|
| 2017-08-10 |
Boris Feld |
log: divergent was renamed into contentdivergent
|
file |
diff |
annotate
|
| 2017-08-10 |
Boris Feld |
log: unstable was renamed into orphan
|
file |
diff |
annotate
|
| 2017-07-25 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0
mercurial-3.9
|
file |
diff |
annotate
|