Mercurial > evolve
diff tests/test-push-checkheads-superceed-A8.t @ 3813:27e7ed2d13a6 stable
next-prev: always respect the --merge flag
An earlier bug fix series which started respecting commands.update.check
introduced a bug in which --merge was not respected sometimes. This patch fixes
that behavior by passing updatecheck as 'none' to hg.updatetotally() if --merge
is passed which is similar to what `hg update` does.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 08 Jun 2018 17:36:28 +0530 |
| parents | 21f06d932231 |
| children | 2280461343e5 62b60fc1983d |