Mercurial > hg-stable
diff tests/test-revert-interactive.t @ 24475:06cbff4674a3
revert: fix --interactive on local modification (issue4576)
We were moving files during the backup phase and it was incompatible with the
way record/crecord is working
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Wed, 25 Mar 2015 14:01:14 -0700 |
parents | f169405c03ab |
children | a85c4ed1132f |
line wrap: on
line diff
--- a/tests/test-revert-interactive.t Wed Mar 25 13:55:35 2015 +0900 +++ b/tests/test-revert-interactive.t Wed Mar 25 14:01:14 2015 -0700 @@ -205,3 +205,53 @@ 4 5 f + $ hg st + M f + M folder1/g + R folder1/i + $ hg revert --interactive f << EOF + > y + > y + > n + > n + > EOF + diff -r 59dd6e4ab63a f + 2 hunks, 2 lines changed + examine changes to 'f'? [Ynesfdaq?] y + + @@ -1,5 +1,6 @@ + +a + 1 + 2 + 3 + 4 + 5 + record change 1/2 to 'f'? [Ynesfdaq?] y + + @@ -1,5 +2,6 @@ + 1 + 2 + 3 + 4 + 5 + +b + record change 2/2 to 'f'? [Ynesfdaq?] n + + $ hg st + M f + M folder1/g + R folder1/i + ? f.orig + $ cat f + a + 1 + 2 + 3 + 4 + 5 + $ cat f.orig + 1 + 2 + 3 + 4 + 5