Patchwork [1,of,2] test-shelve: do not use non-portable pipe-and

login
register
mail settings
Submitter timeless@mozdev.org
Date Oct. 16, 2015, 12:39 a.m.
Message ID <abfb14db2b1492217ff3.1444955946@waste.org>
Download mbox | patch
Permalink /patch/11128/
State Accepted
Headers show

Comments

timeless@mozdev.org - Oct. 16, 2015, 12:39 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1444955521 14400
#      Thu Oct 15 20:32:01 2015 -0400
# Node ID abfb14db2b1492217ff3b97a734847385ea530f1
# Parent  e8f1b728591786143174515ea18089db0df4af90
test-shelve: do not use non-portable pipe-and

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1046,7 +1046,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