Mercurial > hg
view tests/test-issue619 @ 10407:2e8926e9cc32
mq: incorporate mq repo config when using --mq
For example, incoming should use the paths defined in .hg/patches/hgrc
instead of .hg/hgrc.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Wed, 10 Feb 2010 10:58:11 -0800 |
parents | 8808ea7da86b |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg ci -Ama -d '1000000000 0' echo b > b hg branch b hg ci -Amb -d '1000000000 0' hg co -C 0 echo fast-forward hg merge b hg ci -Ammerge -d '1000000000 0' echo bogus fast-forward should fail hg merge b echo done