##// END OF EJS Templates
test-mq-header: don't fail with different patch(1)...
Maxim Dounin -
r5822:38b59253 default
parent child Browse files
Show More
@@ -103,8 +103,7 b' hg qnew 5.patch'
103 hg qpop
103 hg qpop
104 echo "# HG changeset patch" >>.hg/patches/5.patch
104 echo "# HG changeset patch" >>.hg/patches/5.patch
105 echo "# Date 10 0" >>.hg/patches/5.patch
105 echo "# Date 10 0" >>.hg/patches/5.patch
106 # Drop patch specific error line
106 hg qpush 2>&1 | grep 'Now at'
107 hg qpush 2>&1 | grep -v garbage
108 catlogd 5
107 catlogd 5
109
108
110 echo ==== hg qref
109 echo ==== hg qref
@@ -129,9 +129,6 b' 0: [mq]: 1.patch - test'
129 Now at: 3.patch
129 Now at: 3.patch
130 ==== qnew with HG header
130 ==== qnew with HG header
131 Now at: 3.patch
131 Now at: 3.patch
132 applying 5.patch
133 patch failed, unable to continue (try -v)
134 patch 5.patch is empty
135 Now at: 5.patch
132 Now at: 5.patch
136 # HG changeset patch
133 # HG changeset patch
137 # Date 10 0
134 # Date 10 0
@@ -83,8 +83,7 b' hg qnew 5.patch'
83 hg qpop
83 hg qpop
84 echo "# HG changeset patch" >>.hg/patches/5.patch
84 echo "# HG changeset patch" >>.hg/patches/5.patch
85 echo "# User johndoe" >>.hg/patches/5.patch
85 echo "# User johndoe" >>.hg/patches/5.patch
86 # Drop patch specific error line
86 hg qpush 2>&1 | grep 'Now at'
87 hg qpush 2>&1 | grep -v garbage
88 catlog 5
87 catlog 5
89
88
90 echo ==== hg qref
89 echo ==== hg qref
@@ -131,9 +131,6 b' 1: [mq]: 2.patch - jane'
131 0: [mq]: 1.patch - mary
131 0: [mq]: 1.patch - mary
132 ==== qnew with HG header
132 ==== qnew with HG header
133 Now at: 4.patch
133 Now at: 4.patch
134 applying 5.patch
135 patch failed, unable to continue (try -v)
136 patch 5.patch is empty
137 Now at: 5.patch
134 Now at: 5.patch
138 # HG changeset patch
135 # HG changeset patch
139 # User johndoe
136 # User johndoe
General Comments 0
You need to be logged in to leave comments. Login now