Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -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