Mercurial > hg-stable
changeset 26776:f69c79395fb7
test-shelve: do not use non-portable pipe-and
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 15 Oct 2015 20:32:01 -0400 |
| parents | 3c259710737c |
| children | df1a29ec45bf |
| files | tests/test-shelve.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-shelve.t Sun Oct 18 09:05:04 2015 +0900 +++ b/tests/test-shelve.t Thu Oct 15 20:32:01 2015 -0400 @@ -1170,7 +1170,7 @@ [1] $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ mv ../corrupt-shelvedstate .hg/histedit-state - $ hg unshelve --abort |& grep 'rebase aborted' + $ hg unshelve --abort 2>&1 | grep 'rebase aborted' rebase aborted $ hg up -C . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved