| Thu, 11 Mar 2021 12:29:50 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.6
mercurial-5.6
|
| Wed, 26 Aug 2020 23:27:17 +0530 |
Sushil khanchi |
evolve: preserve wdir when using --stop
|
| Thu, 15 Oct 2020 15:40:36 -0700 |
Martin von Zweigbergk |
evolve: when relocating, optionally first try to do it using in-memory merge
|
| Thu, 28 Jan 2021 18:48:36 +0800 |
Anton Shestakov |
tests: back out changeset b3d9e6c805d6
mercurial-5.6
|
| Thu, 19 Nov 2020 08:28:45 -0800 |
Martin von Zweigbergk |
tests: update with more detailed exit codes
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
| Fri, 31 Aug 2018 09:21:19 +0200 |
Pierre-Yves David |
pick: replace `hg grab` invocation in test with `hg pick`
|
| Fri, 31 Aug 2018 09:13:11 +0200 |
Pierre-Yves David |
pick: update command output to mention pick instead of grab
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
| Sat, 28 Apr 2018 18:44:07 +0530 |
Pulkit Goyal |
tests: add test showing `hg evolve --stop` works fine with phase-divergence
stable
|
