| Sun, 03 Jun 2018 02:50:55 +0530 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
| Sun, 03 Jun 2018 02:26:19 +0530 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
| Sun, 03 Jun 2018 02:24:28 +0530 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
| Sun, 03 Jun 2018 03:35:22 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5897
stable
|
| Sun, 27 May 2018 02:32:58 +0530 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
| Wed, 30 May 2018 00:34:35 +0530 |
Pulkit Goyal |
tests: add a test demonstrating issue5897
stable
|
| Thu, 24 May 2018 17:50:02 +0530 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
| Thu, 24 May 2018 02:02:11 +0530 |
Pulkit Goyal |
tests: add tests for testing --abort while content-divergence resolution
|
| Thu, 24 May 2018 00:58:50 +0530 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
| Thu, 24 May 2018 00:58:35 +0530 |
Pulkit Goyal |
tests: add more tests related to aborting while resolving phase-divergence
|
| Wed, 23 May 2018 12:16:24 +0200 |
Denis Laxalde |
topic: suggest to clear a topic that becomes empty
|
| Wed, 23 May 2018 11:37:37 +0200 |
Denis Laxalde |
topic: display a hint pointing at help when a topic becomes non-empty
|
| Thu, 24 May 2018 18:57:46 +0200 |
Pierre-Yves David |
branching: merge with compat fix on default
|
| Thu, 24 May 2018 01:50:26 +0530 |
Pulkit Goyal |
evolve: add compat for repair.stripbmrevset which is moved to scmutil
stable
|
| Wed, 23 May 2018 11:18:14 +0200 |
Pierre-Yves David |
evolve: update the readme with more information about contribution
stable
|
| Wed, 23 May 2018 11:03:31 +0200 |
Denis Laxalde |
topic: dedent items about publishing behavior in docstring
stable
|
| Wed, 23 May 2018 11:00:11 +0200 |
Denis Laxalde |
topic: use preformatted block for config snippets documentation
stable
|
| Wed, 23 May 2018 11:09:37 +0200 |
Denis Laxalde |
tests: add a test for "hg help -e topic"
stable
|
| Wed, 23 May 2018 01:24:02 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 22 May 2018 21:33:50 +0530 |
Pulkit Goyal |
content-div: add test showing `--stop` works during interrupted resolution
|
| Mon, 23 Apr 2018 14:48:53 +0530 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
| Tue, 22 May 2018 20:33:42 +0530 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
| Tue, 22 May 2018 23:51:57 +0530 |
Pulkit Goyal |
utility: use ui.interactive() instead of checking config value
|
| Wed, 23 May 2018 02:46:20 +0530 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
| Wed, 23 May 2018 02:43:23 +0530 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
| Wed, 23 May 2018 02:36:14 +0530 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
| Wed, 23 May 2018 02:33:14 +0530 |
Pulkit Goyal |
evolve: return the new replacement node to be stored in evolvestate
|
| Wed, 23 May 2018 02:39:38 +0530 |
Pulkit Goyal |
evolve: don't make values of replacements dict lists
|
| Wed, 23 May 2018 02:41:08 +0530 |
Pulkit Goyal |
tests: add a test file `--abort` flag while resolving phase-divergence
|
| Tue, 15 May 2018 22:17:27 -0700 |
Martin von Zweigbergk |
evolve: pass revisions as strings to commands.*()
stable
|
