Mercurial > hg
view tests/test-confused-revert @ 12269:877236cdd437
add: move main part to cmdutil to make it easier to reuse
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 13 Sep 2010 13:09:11 +0200 |
parents | 4c94b6d0fb1c |
children |
line wrap: on
line source
#!/bin/sh hg init echo foo > a hg add a hg commit -m "1" 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" hg co -C 0 echo foo-b > a hg commit -m "2b" 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