Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-586 @ 4536:720ae5085ee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix bug where dirstate for removed file is confused This fixes issue586
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 21:16:58 -0500
parents
children
comparison
equal deleted inserted replaced
4535:121999244123 4536:720ae5085ee3
1 #!/bin/sh
2 # a test for issue586
3
4 hg init a
5 cd a
6 echo a > a
7 hg ci -Ama
8
9 hg init ../b
10 cd ../b
11 echo b > b
12 hg ci -Amb
13
14 hg pull -f ../a
15 hg merge
16 hg rm -f a
17 hg ci -Amc
18
19 hg st -A