2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
changeset |
files
|
2018-04-29 |
Pulkit Goyal |
evolve: store divergent nodes in evolvestate when resolving content-divergence
|
changeset |
files
|
2018-05-02 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
2018-04-28 |
Pulkit Goyal |
tests: add test showing `hg evolve --stop` works fine with phase-divergence
stable
|
changeset |
files
|
2018-04-28 |
Pulkit Goyal |
tests: rename the test file to add 'orphan' in the name
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
tests: test that `hg obslog wdir()` aborts with a useful message
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
obshistory: make obslog work when a commit doesn't have any description
stable
|
changeset |
files
|
2018-04-27 |
Anton Shestakov |
obshistory: use a more appropriate type for obslog entries
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaging: mark as development version
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
branching: merge with latest release
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaking: mark as development version
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
Added tag 8.0.0 for changeset 116cdd8c102a
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packaging: update version number
stable 8.0.0
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
packagin: update `tested-with` statement
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
changelog: mention 4.6 compatibility
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
Changelog: pre-version gardening
stable
|
changeset |
files
|
2018-04-25 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
changeset |
files
|
2018-04-23 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from new capabilities
mercurial-4.5
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from 54a469cd5b26
mercurial-4.5
|
changeset |
files
|
2018-04-24 |
Pierre-Yves David |
testcompat: revert output change from 1de6ba0ac6d7
mercurial-4.5
|
changeset |
files
|