view tests/test-merge8 @ 9458:ffeaf5ba25d8

demandimport: blacklist gtk Demandimport breaks gtk. You get a meaningless error about 'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk, but this trips up many extension writers.
author Steve Borho <steve@borho.org>
date Thu, 17 Sep 2009 17:39:43 -0500
parents efbe24c7d8d9
children
line wrap: on
line source

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update