evolve: Graph

CHANGELOG: mention about 4.6.1 compatibility stable
2018-06-09, by Pulkit Goyal
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-06-08, by Pulkit Goyal
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-06-08, by Pulkit Goyal
test-compat: merge stable into mercurial-4.5 mercurial-4.5
2018-06-08, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value stable
2018-05-22, by Pulkit Goyal
CHANGELOG: add couple of entries about things fixed stable
2018-06-08, by Pulkit Goyal
next-prev: always respect the --merge flag stable
2018-06-08, by Pulkit Goyal
next-prev: add tests showing --merge not respected in some cases stable
2018-06-08, by Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
2018-06-07, by Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
2018-06-07, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
2018-06-07, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
2018-06-07, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
2018-06-07, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
2018-06-07, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
2018-06-01, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
2018-06-01, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
2018-06-06, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
2018-06-06, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
2018-06-04, by Pulkit Goyal
evolve: move if-else block under the right block
2018-06-06, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
2018-06-05, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
2018-06-05, by Pulkit Goyal
evolve: remove duplicated documentation
2018-06-06, by Pierre-Yves David
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
2018-06-06, by Pulkit Goyal
evolve: add a help topic `Interrupted-Evolve`
2018-05-23, by Pulkit Goyal
branching: merge with stable
2018-06-05, by Pierre-Yves David
changelog: fix version number error stable
2018-06-05, by Pierre-Yves David
evolve: return the new node formed only as the replacement
2018-05-24, by Pulkit Goyal
tests: add more test of --abort flag for content-divergence resolution
2018-05-24, by Pulkit Goyal
evolve: prompt user for branch selection while resolving content-divergence
2018-06-04, by Pulkit Goyal
evolve: pass the base revision in _completecontentdivergent()
2018-06-05, by Pulkit Goyal
evolve: store the base of content-divergents in evolvestate
2018-06-05, by Pulkit Goyal
evolve: use cmdrewrite.amend() instead of creating a new commit
2018-06-05, by Pulkit Goyal
corecompat: update the tests output to show phase update summary
2018-06-03, by Pulkit Goyal
CHANGELOG: add an entry about issue 5808 being fixed stable
2018-06-03, by Pulkit Goyal
next-prev: replace the error hint to mention about `--merge` flag stable
2018-06-03, by Pulkit Goyal
tests: add tests for conflicts while respecting commands.update.check stable
2018-06-03, by Pulkit Goyal
next: respect `commands.update.check` config option in `hg next` (issue5808) stable
2018-06-03, by Pulkit Goyal
prev: respect `commands.update.check` config option in `hg prev` (issue5808) stable
2018-06-03, by Pulkit Goyal
tests: add test demonstrating issue5808 stable
2018-06-03, by Pulkit Goyal
next: bail out early in `hg next --evolve` if dirty wdir stable
2018-06-03, by Pulkit Goyal
tests: add test of `hg next --evolve` with dirty working directory stable
2018-06-03, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5897 stable
2018-06-03, by Pulkit Goyal
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897) stable
2018-05-27, by Pulkit Goyal
tests: add a test demonstrating issue5897 stable
2018-05-30, by Pulkit Goyal
evolve: add an `--update` flag to `hg evolve` command
2018-05-24, by Pulkit Goyal
tests: add tests for testing --abort while content-divergence resolution
2018-05-24, by Pulkit Goyal
evolve: fix storage of replacements and temprevs node in evolvestate
2018-05-24, by Pulkit Goyal
tests: add more tests related to aborting while resolving phase-divergence
2018-05-24, by Pulkit Goyal
topic: suggest to clear a topic that becomes empty
2018-05-23, by Denis Laxalde
topic: display a hint pointing at help when a topic becomes non-empty
2018-05-23, by Denis Laxalde
branching: merge with compat fix on default
2018-05-24, by Pierre-Yves David
evolve: add compat for repair.stripbmrevset which is moved to scmutil stable
2018-05-24, by Pulkit Goyal
evolve: update the readme with more information about contribution stable
2018-05-23, by Pierre-Yves David
topic: dedent items about publishing behavior in docstring stable
2018-05-23, by Denis Laxalde
topic: use preformatted block for config snippets documentation stable
2018-05-23, by Denis Laxalde
tests: add a test for "hg help -e topic" stable
2018-05-23, by Denis Laxalde
branching: merge with stable
2018-05-23, by Pierre-Yves David
content-div: add test showing `--stop` works during interrupted resolution
2018-05-22, by Pulkit Goyal
evolve: create new commit while resolving content-divergence
2018-04-23, by Pulkit Goyal
content-divergence: store the resolved revs in evolvestate['replacements']
2018-05-22, by Pulkit Goyal
utility: use ui.interactive() instead of checking config value
2018-05-22, by Pulkit Goyal
evolve: make `--abort` strip the temporary revs created during resolution
2018-05-23, by Pulkit Goyal
evolve: store a list of temprevs in evolvestate
2018-05-23, by Pulkit Goyal
evolve: check for None before adding in set of revisions to strip
2018-05-23, by Pulkit Goyal
evolve: return the new replacement node to be stored in evolvestate
2018-05-23, by Pulkit Goyal
evolve: don't make values of replacements dict lists
2018-05-23, by Pulkit Goyal
tests: add a test file `--abort` flag while resolving phase-divergence
2018-05-23, by Pulkit Goyal
evolve: pass revisions as strings to commands.*() stable
2018-05-15, by Martin von Zweigbergk
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
2018-05-23, by Pulkit Goyal
branching: merge with branch for stable
2018-05-21, by Pierre-Yves David
compat: update obshashrange test output
2018-05-21, by Boris Feld
test: update to new outputs
2018-05-21, by Boris Feld
compat: fix obslog with Mercurial 4.6+
2018-05-21, by Boris Feld
debian: add line to clean-docs target to delete additional docs file stable
2018-05-19, by Faheem Mitha
amend: use context manager for locks (issue5887) stable
2018-05-14, by Martin von Zweigbergk
evolve: point to '--abort' in verbose status message stable
2018-05-10, by Martin von Zweigbergk
evolvecmd: add comments and new lines in content-divergence handling logic
2018-04-22, by Pulkit Goyal
evolve: show cset hash in "merging conetnt-divergent changeset"
2018-04-29, by Pulkit Goyal
evolve: show cset hash in "update to local conflict" message
2018-04-29, by Pulkit Goyal
evolve: use hg.updaterepo() instead of hg.update() to hide stats
2018-04-29, by Pulkit Goyal
evolve: fix the conflicts error message during content-divergence resolution
2018-04-29, by Pulkit Goyal
evolve: add logic to continue interrupted content-divergence resolution
2018-04-29, by Pulkit Goyal
evolve: store the evolvestate file when encountering conflicts
2018-04-29, by Pulkit Goyal
evolve: take out logic to complete phase-divergence in separate fn
2018-04-29, by Pulkit Goyal
evolve: store divergent nodes in evolvestate when resolving content-divergence
2018-04-29, by Pulkit Goyal
branching: merge stable into default
2018-05-02, by Pierre-Yves David
tests: add test showing `hg evolve --stop` works fine with phase-divergence stable
2018-04-28, by Pulkit Goyal
tests: rename the test file to add 'orphan' in the name stable
2018-04-28, by Pulkit Goyal
tests: test that `hg obslog wdir()` aborts with a useful message stable
2018-04-27, by Anton Shestakov
obshistory: make obslog work when a commit doesn't have any description stable
2018-04-27, by Anton Shestakov
obshistory: use a more appropriate type for obslog entries stable
2018-04-27, by Anton Shestakov
packaging: mark as development version
2018-04-25, by Pierre-Yves David
branching: merge with latest release
2018-04-25, by Pierre-Yves David
packaking: mark as development version stable
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-04-25, by Pierre-Yves David
test-compat: merge stable into mercurial-4.5 mercurial-4.5
2018-04-25, by Pierre-Yves David
Added tag 8.0.0 for changeset 116cdd8c102a stable
2018-04-25, by Pierre-Yves David
packaging: update version number stable 8.0.0
2018-04-25, by Pierre-Yves David
packagin: update `tested-with` statement stable
2018-04-25, by Pierre-Yves David
changelog: mention 4.6 compatibility stable
2018-04-25, by Pierre-Yves David
Changelog: pre-version gardening stable
2018-04-25, by Pierre-Yves David
testcompat: update output for Mercurial 4.3 mercurial-4.3
2018-04-25, by Pierre-Yves David
test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
2018-04-23, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
2018-04-23, by Pierre-Yves David
testcompat: revert output change from new capabilities mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: revert output change from 54a469cd5b26 mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: revert output change from 1de6ba0ac6d7 mercurial-4.5
2018-04-24, by Pierre-Yves David
testcompat: merge stable into mercurial-4.5 mercurial-4.5
2018-04-23, by Pierre-Yves David
compat: handle different `ui.edit` signature with Mercurial 4.3 stable
2018-04-24, by Pierre-Yves David
wirepeer: try modern module first stable
2018-04-24, by Pierre-Yves David
compat: handle lack of allpredecessors for Mercurial 4.3 stable
2018-04-24, by Pierre-Yves David
branching: merge further fix into stable stable
2018-04-23, by Pierre-Yves David
wrapping: fix a silly error were we checking on module and wrapping the other
2018-04-23, by Pierre-Yves David
brancing: merge next release into default stable
2018-04-23, by Pierre-Yves David
test-compat: open mercurial-4.5 branch mercurial-4.5
2018-04-21, by Pierre-Yves David
evolve: point to '--abort' in error message
2018-04-22, by Pierre-Yves David
compat: drop compatibility layer for pager
2018-04-19, by Pierre-Yves David
compat: drop compatibility layer for duplicatecopies
2018-04-19, by Pierre-Yves David