Mercurial > hg
view tests/test-pull-update @ 10894:26cf11f9f322
keyword: make the templater a local variable
After 6722ba3bf80b a class attribute makes no sense.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 12 Apr 2010 17:34:12 +0200 |
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