Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 2452:d1a7c8a5b835
Emacs: use delete-region instead of kill-* functions.
This patch eliminates `kill-line' which taints kill-ring,
and `kill-entire-line' which is specific for XEmacs.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Jun 2006 00:06:28 +0900 |
parents | e506c14382fd |
children | 890e285c52a1 |
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 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 echo "%%% revert should be ok now" hg revert -r2 echo "%%% should show b unknown and a marked modified (merged)" hg status echo "%%% should show foo-b" cat a