Mercurial > hg
view tests/test-confused-revert @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:34 +0200 |
parents | 890e285c52a1 |
children | 4c94b6d0fb1c |
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