##// END OF EJS Templates
run-tests.py: pass -L/--label to simplemerge...
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

File last commit:

r2496:6dbb8ae0 default
r4387:93a4e72b default
Show More
test-default-push
18 lines | 362 B | text/plain | TextLexer
#!/bin/sh
hg init a
echo a > a/a
hg --cwd a ci -Ama
hg clone a c
hg clone a b
echo b >> b/a
hg --cwd b ci -mb
echo % push should push to default when default-push not set
hg --cwd b push | sed 's/pushing to.*/pushing/'
echo % push should push to default-push when set
echo 'default-push = ../c' >> b/.hg/hgrc
hg --cwd b push | sed 's/pushing to.*/pushing/'