Mercurial > hg-stable
changeset 27350:890273343170
tests: histedit-helpers fixbundle should not complain about no input
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 14 Dec 2015 22:21:30 +0000 |
| parents | 5b68f72c2ba9 |
| children | 28e50c4b15ed |
| files | tests/histedit-helpers.sh tests/test-histedit-no-change.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/histedit-helpers.sh Mon Dec 14 22:34:30 2015 +0000 +++ b/tests/histedit-helpers.sh Mon Dec 14 22:21:30 2015 +0000 @@ -2,5 +2,6 @@ grep -v 'saving bundle' | grep -v 'saved backup' | \ grep -v added | grep -v adding | \ grep -v "unable to find 'e' for patching" | \ - grep -v "e: No such file or directory" + grep -v "e: No such file or directory" | \ + cat }
--- a/tests/test-histedit-no-change.t Mon Dec 14 22:34:30 2015 +0000 +++ b/tests/test-histedit-no-change.t Mon Dec 14 22:21:30 2015 +0000 @@ -187,7 +187,6 @@ hist: 2 remaining (histedit --continue) $ hg histedit --abort 2>&1 | fixbundle - [1] modified files should survive the abort when we've moved away already $ hg st