Mercurial > hg
view tests/test-merge-default @ 10359:ec02cf8d1628
mq: add --mq option to some commands
This causes them to operate on the queue repository as qcommit does, and
is nicer than hg -R $(hg root)
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 23 Dec 2008 09:46:40 -0800 |
parents | a5576908b589 |
children | d2c1fc440533 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge -P hg merge hg commit -mm2 echo % should fail because at tip hg merge hg up 0 echo % should fail because 1 head hg merge hg up 3 echo a >> a hg branch foobranch hg commit -mf echo % should fail because merge with other branch hg merge true