Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 4724:a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Jun 2007 21:18:19 -0500 |
parents | 890e285c52a1 |
children |
line wrap: on
line source
#!/bin/sh hg init echo foo > a hg add a hg commit -m "1" -d "1000000 0" echo bar > b hg add b hg remove a echo "%%% should show a removed and b added" hg status echo "reverting..." hg revert --all echo "%%% should show b unknown and a back to normal" hg status rm b hg co -C 0 echo foo-a > a hg commit -m "2a" -d "1000000 0" hg co -C 0 echo foo-b > a hg commit -m "2b" -d "1000000 0" HGMERGE=true hg merge 1 echo "%%% should show foo-b" cat a echo bar > b hg add b rm a hg remove a echo "%%% should show a removed and b added" hg status echo "%%% revert should fail" hg revert --all echo "%%% revert should be ok now" hg revert -r2 --all echo "%%% should show b unknown and a marked modified (merged)" hg status echo "%%% should show foo-b" cat a