Mercurial > evolve
diff tests/test-topic-flow-publish-bare.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 | f7129e3d5a38 |
| children | 1bc4b0807c37 |