Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5467:521284cdbcb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
author NIIMI Satoshi <sa2c@sa2c.net>
date Thu, 11 Oct 2007 06:10:45 +0900
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