2019-12-16 |
Martin von Zweigbergk |
tests: add debugobsolete calls before many obslog calls
|
file |
diff |
annotate
|
2020-04-15 |
Anton Shestakov |
tests: update output to match 1b8fd4af3318 in core
|
file |
diff |
annotate
|
2019-11-10 |
Sushil khanchi |
evolve: add pre-check logic for creation of phase divergence locally
draft
|
file |
diff |
annotate
|
2019-11-10 |
Sushil khanchi |
evolve: add pre-check logic for creation of phase divergence locally
draft
|
file |
diff |
annotate
|
2019-11-10 |
Sushil khanchi |
evolve: add test to show that user can create phase-divergence locally
draft
|
file |
diff |
annotate
|
2020-02-29 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2020-02-29 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
2020-01-14 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
file |
diff |
annotate
|
2019-09-27 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2019-09-27 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
2019-08-30 |
Anton Shestakov |
obslog: only indent the first chunk and chunks just after newlines (issue6175)
stable
|
file |
diff |
annotate
|
2019-08-30 |
Anton Shestakov |
tests: demonstrate too many spaces in olog -p output with word-diff
stable
|
file |
diff |
annotate
|
2019-07-29 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2019-07-29 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
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.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2019-06-05 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
2019-04-19 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
file |
diff |
annotate
|
2019-04-24 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
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-23 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
file |
diff |
annotate
|
2019-04-11 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
2019-04-11 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2019-04-11 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
2019-04-10 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
file |
diff |
annotate
|
2019-04-10 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
file |
diff |
annotate
|
2019-04-10 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
file |
diff |
annotate
|
2019-04-10 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
2019-04-09 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
file |
diff |
annotate
|
2019-03-28 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
file |
diff |
annotate
|
2019-03-28 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
file |
diff |
annotate
|
2019-03-26 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
file |
diff |
annotate
|
2019-03-26 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
file |
diff |
annotate
|
2019-03-20 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
file |
diff |
annotate
|
2019-03-12 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
file |
diff |
annotate
|
2019-03-12 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
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
|
2019-01-22 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2019-01-22 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
2019-01-11 |
Martin von Zweigbergk |
fold: sort concatenated commit messages in topological order
|
file |
diff |
annotate
|
2018-10-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
2018-10-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
2018-10-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
2018-10-25 |
Pierre-Yves David |
branching: revert test outptu change for 4.7
mercurial-4.7
|
file |
diff |
annotate
|
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
|