tests/test-merge8
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Fri, 01 Jun 2007 19:56:39 -0400
changeset 4538 4272ae760bb1
parent 3389 efbe24c7d8d9
permissions -rwxr-xr-x
gitweb: Display branch and tag labels Pages which display labels: - summary - shortlog - changelog - changeset - search

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