Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 3897:f47afa2401a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demandimport: ignore _hashlib and email.mime This makes things work with Python2.5. A better fix would be to fix demandload to use __getattribute__ to be more transparent.
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Dec 2006 12:38:18 -0600
parents efbe24c7d8d9
children
line wrap: on
line source

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