Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 1747:91c56c427171
transitive copy/rename
Add support for transitive copy or rename operations, e.g.
hg rename a b
... (possibly edit b)
hg rename b c
hg commit ...
by actually renaming "b" as "c" while recording a copy of
"a" to "c" and a removal of "a".
author | Robin Farine <robin.farine@terminus.org> |
---|---|
date | Sat, 18 Feb 2006 07:37:59 -0800 |
parents | 30146be3437c |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo foo > a hg add a hg commit -m "1" -d "0 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 "0 0" hg co -C 0 echo foo-b > a hg commit -m "2b" -d "0 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