| 2018-08-02 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
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-05 |
Pulkit Goyal |
evolve: pop up editor if conflicts occur while merging commit messages
|
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-04-29 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
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-13 |
Martin von Zweigbergk |
evolve: update output for wider reporting of troubled changesets
|
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-05 |
Boris Feld |
test: update output to 9b3f95d9783d
|
file |
diff |
annotate
|
| 2017-11-01 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
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 --contentdivergent flag to --content-divergent
|
file |
diff |
annotate
|
| 2017-10-20 |
Pierre-Yves David |
test-compat: merge with mercurial-4.3 branch
mercurial-4.2
|
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-10-20 |
Pierre-Yves David |
test-compat: revert output change on pull report
mercurial-4.3
|
file |
diff |
annotate
|
| 2017-10-17 |
Pierre-Yves David |
test: adapt to output change from eb586ed5d8ce
|
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 4.2 compat branch
mercurial-4.2
|
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-11 |
Boris Feld |
revset: divergent() is deprecated
|
file |
diff |
annotate
|
| 2017-08-10 |
Boris Feld |
log: divergent was renamed into contentdivergent
|
file |
diff |
annotate
|
| 2017-07-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 with the new stable branch content
mercurial-4.2
|
file |
diff |
annotate
|
| 2017-07-23 |
Pierre-Yves David |
amend: use precheck to validate revision
|
file |
diff |
annotate
|
| 2017-07-06 |
Pierre-Yves David |
compat: adapt to change in 53b3a1968aa6-core
|
file |
diff |
annotate
|
| 2017-07-02 |
Pierre-Yves David |
merge back with stable
|
file |
diff |
annotate
|
| 2017-07-02 |
Pierre-Yves David |
merge: default into stable to prepare next version
stable
|
file |
diff |
annotate
|
| 2017-06-15 |
Boris Feld |
test-update: update hg update output in test files
|
file |
diff |
annotate
|
| 2017-03-31 |
Pierre-Yves David |
test-compat-hg-3.9: merge with future 6.0
mercurial-3.9
|
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-28 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-10-28 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.7
|
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-05-05 |
Pierre-Yves David |
merge with stable through 3.5 branch
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-05-05 |
Pierre-Yves David |
mercurial-3.7: revert output change
mercurial-3.7
|
file |
diff |
annotate
|
| 2016-04-14 |
Pierre-Yves David |
tests: adapt output to the new graphlog style
|
file |
diff |
annotate
|
| 2016-02-14 |
Pierre-Yves David |
tests: add head warning messages
|
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.4
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-02-03 |
Pierre-Yves David |
test: back hash change from 'extra' content change out
|
file |
diff |
annotate
|
| 2015-12-04 |
Laurent Charignon |
evolve: fix test-sharing.t to match new extra computation in core
|
file |
diff |
annotate
|
| 2015-08-03 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-08-02 |
Matt Harbison |
test-sharing: fix globs for Windows
stable
|
file |
diff |
annotate
|
| 2015-06-26 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| 2015-06-26 |
Pierre-Yves David |
tests: adapt the test for Mercurial 3.3
mercurial-3.3
|
file |
diff |
annotate
|
| 2015-06-25 |
Pierre-Yves David |
merge with stable
stable
|
file |
diff |
annotate
|
| 2015-06-16 |
Laurent Charignon |
evolve: add selector for trouble types
|
file |
diff |
annotate
|
| 2015-06-04 |
Pierre-Yves David |
test: adapt to change in mercurial core
|
file |
diff |
annotate
|
| 2015-04-14 |
Greg Ward |
docs: revive the explanation of divergent changesets in the sharing guide
stable
|
file |
diff |
annotate
|