Show More
@@ -147,6 +147,7 b' testpats = [' | |||
|
147 | 147 | '[ foo == bar ] is a bashism, use [ foo = bar ] instead', |
|
148 | 148 | ), |
|
149 | 149 | (r'(^|\|\s*)egrep', "use grep -E for extended grep syntax"), |
|
150 | (r'(^|\|\s*)fgrep', "use grep -F for fixed string grepping"), | |
|
150 | 151 | (r'(^|\|\s*)e?grep .*\\S', "don't use \\S in regular expression"), |
|
151 | 152 | (r'(?<!!)/bin/', "don't use explicit paths for tools"), |
|
152 | 153 | (r'#!.*/bash', "don't use bash in shebang, use sh"), |
@@ -230,17 +230,17 b' test shelving' | |||
|
230 | 230 | make the bookmark move by updating it on a, and then pulling with a local change |
|
231 | 231 | # add a commit to a |
|
232 | 232 | $ cd ../a |
|
233 |
$ hg up -C X | |
|
|
233 | $ hg up -C X |grep -F "activating bookmark X" | |
|
234 | 234 | (activating bookmark X) |
|
235 | 235 | # go back to b, and check out X |
|
236 | 236 | $ cd ../b |
|
237 |
$ hg up -C X | |
|
|
237 | $ hg up -C X |grep -F "activating bookmark X" | |
|
238 | 238 | (activating bookmark X) |
|
239 | 239 | # update and push from a |
|
240 | 240 | $ make_changes ../a |
|
241 | 241 | created new head |
|
242 | 242 | $ echo "more" >> test |
|
243 |
$ hg pull -u 2>&1 | |
|
|
243 | $ hg pull -u 2>&1 | grep -F -v TESTTMP| grep -F -v "searching for changes" | grep -F -v adding | |
|
244 | 244 | pulling from $TESTTMP/a |
|
245 | 245 | updating bookmark X |
|
246 | 246 | added 1 changesets with 0 changes to 0 files (+1 heads) |
General Comments 0
You need to be logged in to leave comments.
Login now