tests/test-merge8
author Brendan Cully <brendan@kublai.com>
Fri, 29 Feb 2008 14:47:07 -0800
changeset 6198 358cc9cf54db
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
highlight: guess by text when path name is ambiguous Although the docs claim that guess_lexer_for_filename will fall back to using file data, my ubuntu 7.10 pygments library seems to ignore the text argument. So call guess_lexer explicitly on failure.

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update