| 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 |
tests: make sure we don't result in commit messages conflict
|
file |
diff |
annotate
|
| 2018-06-05 |
Pulkit Goyal |
tests: don't use mkcommit shell function in test-divergent.t
|
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-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-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-16 |
Pierre-Yves David |
branching: merge stable back into default
|
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 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: 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 |
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-10 |
Boris Feld |
log: divergent was renamed into contentdivergent
|
file |
diff |
annotate
|
| 2017-07-24 |
Pierre-Yves David |
test: remove reference to the graphlog extension
|
file |
diff |
annotate
|
| 2017-02-28 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
file |
diff |
annotate
|
| 2016-05-05 |
Pierre-Yves David |
merge with stable through 3.5 branch
mercurial-3.4
|
file |
diff |
annotate
|
| 2016-03-17 |
Juntao Li |
evolve: Fix crush when reading docstring
|
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
|
| 2015-11-18 |
Laurent Charignon |
evolve: evolve --divergent failed when merge had nothing to do (issue4950)
|
file |
diff |
annotate
|