| 2018-06-02 |
Pulkit Goyal |
next-prev: replace the error hint to mention about `--merge` flag
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
tests: add tests for conflicts while respecting commands.update.check
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
prev: respect `commands.update.check` config option in `hg prev` (issue5808)
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
changeset |
files
|
| 2018-06-02 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5897
stable
|
changeset |
files
|
| 2018-05-26 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
changeset |
files
|
| 2018-05-29 |
Pulkit Goyal |
tests: add a test demonstrating issue5897
stable
|
changeset |
files
|
| 2018-05-24 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
changeset |
files
|
| 2018-05-23 |
Pulkit Goyal |
tests: add tests for testing --abort while content-divergence resolution
|
changeset |
files
|
| 2018-05-23 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
changeset |
files
|
| 2018-05-23 |
Pulkit Goyal |
tests: add more tests related to aborting while resolving phase-divergence
|
changeset |
files
|
| 2018-05-23 |
Denis Laxalde |
topic: suggest to clear a topic that becomes empty
|
changeset |
files
|
| 2018-05-23 |
Denis Laxalde |
topic: display a hint pointing at help when a topic becomes non-empty
|
changeset |
files
|
| 2018-05-24 |
Pierre-Yves David |
branching: merge with compat fix on default
|
changeset |
files
|
| 2018-05-23 |
Pulkit Goyal |
evolve: add compat for repair.stripbmrevset which is moved to scmutil
stable
|
changeset |
files
|
| 2018-05-23 |
Pierre-Yves David |
evolve: update the readme with more information about contribution
stable
|
changeset |
files
|
| 2018-05-23 |
Denis Laxalde |
topic: dedent items about publishing behavior in docstring
stable
|
changeset |
files
|
| 2018-05-23 |
Denis Laxalde |
topic: use preformatted block for config snippets documentation
stable
|
changeset |
files
|
| 2018-05-23 |
Denis Laxalde |
tests: add a test for "hg help -e topic"
stable
|
changeset |
files
|
| 2018-05-22 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
content-div: add test showing `--stop` works during interrupted resolution
|
changeset |
files
|
| 2018-04-23 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
evolve: return the new replacement node to be stored in evolvestate
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
evolve: don't make values of replacements dict lists
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
tests: add a test file `--abort` flag while resolving phase-divergence
|
changeset |
files
|
| 2018-05-16 |
Martin von Zweigbergk |
evolve: pass revisions as strings to commands.*()
stable
|
changeset |
files
|
| 2018-05-22 |
Pulkit Goyal |
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t
|
changeset |
files
|
| 2018-05-21 |
Pierre-Yves David |
branching: merge with branch for stable
|
changeset |
files
|
| 2018-05-21 |
Boris Feld |
compat: update obshashrange test output
|
changeset |
files
|
| 2018-05-21 |
Boris Feld |
test: update to new outputs
|
changeset |
files
|
| 2018-05-21 |
Boris Feld |
compat: fix obslog with Mercurial 4.6+
|
changeset |
files
|
| 2018-05-19 |
Faheem Mitha |
debian: add line to clean-docs target to delete additional docs file
stable
|
changeset |
files
|
| 2018-05-14 |
Martin von Zweigbergk |
amend: use context manager for locks (issue5887)
stable
|
changeset |
files
|
| 2018-05-11 |
Martin von Zweigbergk |
evolve: point to '--abort' in verbose status message
stable
|
changeset |
files
|
| 2018-04-22 |
Pulkit Goyal |
evolvecmd: add comments and new lines in content-divergence handling logic
|
changeset |
files
|
| 2018-04-29 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
changeset |
files
|
| 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
|