Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-undo @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
350
diff
changeset
|
1 #!/bin/sh |
336 | 2 |
3 set -x | |
4 mkdir t | |
5 cd t | |
6 hg init | |
7 echo a > a | |
8 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
9 hg commit -m "test" -d "0 0" |
336 | 10 hg verify |
11 hg parents | |
12 hg status | |
13 hg undo | |
14 hg verify | |
15 hg parents | |
16 hg status |