Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5080:b304c2496f52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: fix rebuild; add a test If rebuild calls invalidate, it will just queue a (re)read of the dirstate file, while what we really want is to empty the current state.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 05 Aug 2007 23:04:56 -0300
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