Mercurial > hg
view tests/test-pull-update @ 10372:27d542bc0f5b
qnew: ignore force option
This makes the default behavior the same as qnew --force, and
deprecates the force option.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sun, 07 Feb 2010 07:37:05 -0600 |
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