Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge8 @ 3389:efbe24c7d8d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 14 Oct 2006 10:53:29 +0200
parents
children
comparison
equal deleted inserted replaced
3388:5eecae4ff722 3389:efbe24c7d8d9
1 #!/bin/sh
2
3 # Test for changeset ba7c74081861
4 # (update dirstate correctly for non-branchmerge updates)
5 hg init a
6 cd a
7 echo a > a
8 hg add a
9 hg commit -m a
10 cd ..
11 hg clone a b
12 cd a
13 hg mv a b
14 hg commit -m move
15 echo b >> b
16 hg commit -m b
17 cd ../b
18 hg pull ../a
19 hg update