| Mon, 04 Jun 2018 04:03:02 +0530 |
Pulkit Goyal |
evolve: prompt user for branch selection while resolving content-divergence
|
| Tue, 05 Jun 2018 03:51:01 +0530 |
Pulkit Goyal |
evolve: pass the base revision in _completecontentdivergent()
|
| Tue, 05 Jun 2018 03:49:49 +0530 |
Pulkit Goyal |
evolve: store the base of content-divergents in evolvestate
|
| Tue, 05 Jun 2018 00:53:21 +0530 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
| Sun, 03 Jun 2018 01:59:41 +0530 |
Pulkit Goyal |
corecompat: update the tests output to show phase update summary
|
| Sun, 03 Jun 2018 03:24:43 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about issue 5808 being fixed
stable
|
| Sun, 03 Jun 2018 03:21:25 +0530 |
Pulkit Goyal |
next-prev: replace the error hint to mention about `--merge` flag
stable
|
| Sun, 03 Jun 2018 03:13:47 +0530 |
Pulkit Goyal |
tests: add tests for conflicts while respecting commands.update.check
stable
|
| Sun, 03 Jun 2018 02:37:13 +0530 |
Pulkit Goyal |
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
|
| Sun, 03 Jun 2018 02:36:24 +0530 |
Pulkit Goyal |
prev: respect `commands.update.check` config option in `hg prev` (issue5808)
stable
|
| 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
|
