Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | 7544700fd931 |
children | 6c6c0e5595a2 |
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 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 update -m 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 "reverting..." hg revert echo "%%% should show b unknown and a marked modified (merged)" hg status echo "%%% should show foo-b" cat a