Mercurial > hg
view tests/test-strict @ 5239:8860f29447c1
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 23 Aug 2007 19:51:59 -0700 |
parents | 4e815ee377fd |
children | 6c82beaaa11a |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -d '0 0' -Ama hg an a echo "[ui]" >> $HGRCPATH echo "strict=True" >> $HGRCPATH hg an a hg annotate a echo % should succeed - up is an alias, not an abbreviation hg up