Mercurial > hg
view tests/test-pull-update @ 12135:b6cc68ef2702
test-serve: ensure KILLQUIETLY is only used once
49463314c24f introduced a feature to the hgserve() function that
suppresses errors from kill(1). It wrongly assumed that setting an
environment variable when calling a function would make it local to
the function. It ended up suppressing kill errors for every call
thereafter.
This patch sets KILLQUIETLY=N after use.
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Mon, 30 Aug 2010 11:16:21 -0400 |
parents | 73fdc8bd3ed8 |
children |
line wrap: on
line source
#!/bin/sh # hg init t cd t echo 1 > foo hg ci -Am m cd .. hg clone t tt cd tt echo 1.1 > foo hg ci -Am m cd ../t echo 1.2 > foo hg ci -Am m echo % should fail hg pull -u ../tt cd ../tt echo % should fail hg pull -u ../t HGMERGE=true hg merge hg ci -mm cd ../t echo % should work hg pull -u ../tt