Mercurial > evolve
view tests/testlib/topic_setup.sh @ 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 | fa2deeb5dd03 |
children | 044ce00dfa88 |
line wrap: on
line source
#!/bin/sh . $TESTDIR/testlib/pythonpath.sh # This file holds logic that is used in many tests. # It can be called in a test like this: # $ . "$TESTDIR/testlib/topic_setup.sh" # Enable obsolete markers and enable extensions cat >> $HGRCPATH << EOF [experimental] evolution=createmarkers,exchange [extensions] rebase= topic= EOF