Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-revert2.out @ 833:ad8ff3534fde
Removed special FIXME handling in run-tests, added bug info to .out files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 18:13:17 +0100 |
parents | 8f5637f0a0c0 |
children | 1fe3b14c7044 |
comparison
equal
deleted
inserted
replaced
832:b65773f7db41 | 833:ad8ff3534fde |
---|---|
42 M file1 | 42 M file1 |
43 + hg id | 43 + hg id |
44 3aa14bbc23d9+ tip | 44 3aa14bbc23d9+ tip |
45 + hg revert | 45 + hg revert |
46 + hg diff | 46 + hg diff |
47 FIXME: This is a known bug: | |
47 + hg status | 48 + hg status |
48 + hg id | 49 + hg id |
49 3aa14bbc23d9 tip | 50 3aa14bbc23d9 tip |
50 + hg revert -r tip | 51 + hg revert -r tip |
51 + hg diff | 52 + hg diff |