tests/test-merge8
author Kevin Christen <kevin.christen@gmail.com>
Mon, 07 Jan 2008 21:29:40 -0600
changeset 5820 3a1ffc1da32c
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
Fixed numerous XHTML problems that caused validation errors and warnings. Link elements for Atom and RSS feeds had no end tag. <div> block element inside <a> in-line element isn't right and caused rendering problems on Safari. Spurious </div> tag in search forms. Branch entry missing closing </a> tag.

#!/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