Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-confused-revert @ 2214:6c6c0e5595a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make test-confused-revert check working dir with two parents.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 05 May 2006 10:45:08 -0700
parents 7544700fd931
children e506c14382fd
comparison
equal deleted inserted replaced
2213:6f76a479ae51 2214:6c6c0e5595a2
39 hg remove a 39 hg remove a
40 40
41 echo "%%% should show a removed and b added" 41 echo "%%% should show a removed and b added"
42 hg status 42 hg status
43 43
44 echo "reverting..." 44 echo "%%% revert should fail"
45 hg revert 45 hg revert
46
47 echo "%%% revert should be ok now"
48 hg revert -r2
46 49
47 echo "%%% should show b unknown and a marked modified (merged)" 50 echo "%%% should show b unknown and a marked modified (merged)"
48 hg status 51 hg status
49 52
50 echo "%%% should show foo-b" 53 echo "%%% should show foo-b"