Mercurial > hg
view tests/test-pull-update @ 8056:f614f11a96ca
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
author | Pascal Quantin <pascal.quantin@gmail.com> |
---|---|
date | Sun, 25 Jan 2009 21:55:18 +0100 |
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