Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8 @ 5326:319c09685f30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: make dir collision logic faster - shortcircuit decpath if we haven't built the _dirs map - increment only for leafnodes of directory tree (this should make construction more like O(nlog n) than O(n^2))
author Matt Mackall <mpm@selenic.com>
date Mon, 24 Sep 2007 12:36:38 -0500
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