Mercurial > hg
view tests/test-pull-update @ 6067:57c1a7052982
Option to log to only show changesets within a specified branch.
author | Dustin Sallings <dustin@spy.net> |
---|---|
date | Fri, 08 Feb 2008 21:31:03 -0800 |
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