author | Patrick Mezard <pmezard@gmail.com> |
Sat, 14 Jul 2007 18:34:06 +0200 | |
changeset 4881 | c51c9bc4579d |
parent 4536 | 720ae5085ee3 |
permissions | -rwxr-xr-x |
4536
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
#!/bin/sh |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
# a test for issue586 |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
|
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 |
hg init a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 |
cd a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 |
echo a > a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
hg ci -Ama |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
|
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
hg init ../b |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 |
cd ../b |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
echo b > b |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 |
hg ci -Amb |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 |
|
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
hg pull -f ../a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 |
hg merge |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
hg rm -f a |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 |
hg ci -Amc |
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 |
|
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 |
hg st -A |