| 2018-12-21 |
Pierre-Yves David |
evolve: detect unresolved conflict during evolve --continue (issue5966)
stable
|
file |
diff |
annotate
|
| 2018-09-03 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| 2018-09-03 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| 2018-09-03 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| 2018-08-31 |
Pierre-Yves David |
pick: replace `hg grab` invocation in test with `hg pick`
|
file |
diff |
annotate
|
| 2018-08-31 |
Pierre-Yves David |
pick: update command output to mention pick instead of grab
|
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: 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
|
| 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
|
| 2017-07-24 |
Pierre-Yves David |
test: remove reference to the graphlog extension
|
file |
diff |
annotate
|
| 2017-06-16 |
Boris Feld |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| 2017-06-15 |
Pierre-Yves David |
test: drop now useless config about effect flag
|
file |
diff |
annotate
|
| 2017-06-04 |
Boris Feld |
effectflag: activate effect flag on test-stabilize-result.t test file
|
file |
diff |
annotate
|
| 2017-05-03 |
Pierre-Yves David |
merge with future 6.1.0
mercurial-3.9
|
file |
diff |
annotate
|
| 2017-04-28 |
Boris Feld |
ui: add better messages when the working copy become obsolete.
|
file |
diff |
annotate
|
| 2017-03-14 |
Pierre-Yves David |
mercurial-3.9: merge with hg-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| 2017-02-28 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
file |
diff |
annotate
|
| 2016-10-29 |
Pierre-Yves David |
merge with latest fix
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-10-29 |
Pierre-Yves David |
merge with latest fix
mercurial-3.5
|
file |
diff |
annotate
|
| 2016-10-29 |
Pierre-Yves David |
merge with latest fix
mercurial-3.9
|
file |
diff |
annotate
|
| 2016-10-29 |
Martin von Zweigbergk |
evolve: use single quotes in usage messages
stable
|
file |
diff |
annotate
|
| 2016-10-29 |
Martin von Zweigbergk |
evolve: prefer "abort" over "abandon" in messages for consistency
stable
|
file |
diff |
annotate
|
| 2016-10-28 |
Martin von Zweigbergk |
evolve: suggest "hg update -C .", including '.', to abort evolve
stable
|
file |
diff |
annotate
|
| 2016-10-28 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-10-28 |
Pierre-Yves David |
merge future 5.5
mercurial-3.5
|
file |
diff |
annotate
|
| 2016-10-28 |
Pierre-Yves David |
integrate code update and test change from future 5.5 code
mercurial-3.9
|
file |
diff |
annotate
|
| 2016-09-22 |
Kostia Balytskyi |
evolve: fix test breaks related to double->single quote changes
|
file |
diff |
annotate
|
| 2016-09-12 |
Durham Goode |
bump: copy parent manifest before editting it
stable
|
file |
diff |
annotate
|
| 2016-05-05 |
Pierre-Yves David |
merge with stable through 3.5 branch
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-05-05 |
Pierre-Yves David |
merge with stable throug 3.6 branch
mercurial-3.5
|
file |
diff |
annotate
|
| 2016-03-18 |
Pierre-Yves David |
prune: remove the kill alias
|
file |
diff |
annotate
|
| 2016-02-11 |
Pierre-Yves David |
merge with new stable through 3.5 and 3.6
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-02-04 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.5
mercurial-3.5
|
file |
diff |
annotate
|
| 2016-02-04 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.4
mercurial-3.4
|
file |
diff |
annotate
|
| 2015-10-30 |
Pierre-Yves David |
tests: run test with 3.6 and apply test change
|
file |
diff |
annotate
|
| 2015-06-26 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-06-25 |
Pierre-Yves David |
merge with stable
stable
|
file |
diff |
annotate
|
| 2015-06-24 |
Pierre-Yves David |
evolve: add a hint when the parent working copy become obsolete
|
file |
diff |
annotate
|
| 2015-06-16 |
Laurent Charignon |
evolve: add selector for trouble types
|
file |
diff |
annotate
|
| 2015-06-19 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-06-19 |
Pierre-Yves David |
evolve: add a hint about how to abort an evolve with conflict
stable
|
file |
diff |
annotate
|
| 2015-06-19 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-06-19 |
Pierre-Yves David |
evolve: fix default value for --confirm
stable
|
file |
diff |
annotate
|
| 2015-06-19 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-06-18 |
Pierre-Yves David |
evolve: search divergence within all precursors
stable
|
file |
diff |
annotate
|
| 2015-06-01 |
Pierre-Yves David |
tests: adapt summary output to 6084926366b9
|
file |
diff |
annotate
|
| 2015-01-30 |
Pierre-Yves David |
tests: update to new core output
|
file |
diff |
annotate
|
| 2014-12-14 |
Pierre-Yves David |
test: adapt to core change in graft and rebase
|
file |
diff |
annotate
|
| 2014-08-29 |
David Soria Parra |
evolve: write a status message when the working directory changes
stable
|
file |
diff |
annotate
|
| 2014-08-21 |
Pierre-Yves David |
evolve: yield to relevant markers handling in core
|
file |
diff |
annotate
|
| 2014-08-16 |
Pierre-Yves David |
test: update test to new date formatting in debuobsolete output
|
file |
diff |
annotate
|
| 2014-08-09 |
Pierre-Yves David |
evolve: adds a --confirm option
|
file |
diff |
annotate
|
| 2014-08-08 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2014-08-08 |
Pierre-Yves David |
test: apply message changes introduced by mercurial 3.1
stable
|
file |
diff |
annotate
|
| 2014-07-30 |
Pierre-Yves David |
test: adapt to upstream message change
|
file |
diff |
annotate
|
| 2014-06-21 |
Greg Ward |
tests: fix grammar, spelling, punctuation in comments
|
file |
diff |
annotate
|
| 2014-06-02 |
Pierre-Yves David |
test: update to output change introduced by future 3.1
|
file |
diff |
annotate
|
| 2014-05-31 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2014-04-29 |
Angel Ezquerra |
evolve: improve wording of a few of messages
stable
|
file |
diff |
annotate
|
| 2014-05-25 |
Greg Ward |
evolve: fix spelling error
stable
|
file |
diff |
annotate
|