##// END OF EJS Templates
tests: rewrite path in test-shelve.t for not being mangled on msys...
Simon Heimberg -
r20423:ada289df default
parent child Browse files
Show More
@@ -150,6 +150,9 b' utestpats = ['
150 "explicit exit code checks unnecessary"),
150 "explicit exit code checks unnecessary"),
151 (uprefix + r'set -e', "don't use set -e"),
151 (uprefix + r'set -e', "don't use set -e"),
152 (uprefix + r'(\s|fi\b|done\b)', "use > for continued lines"),
152 (uprefix + r'(\s|fi\b|done\b)', "use > for continued lines"),
153 (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite "
154 "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx
155 'hg pull -q file:../test'), # in test-pull.t which is skipped on windows
153 (r'^ saved backup bundle to \$TESTTMP.*\.hg$', winglobmsg),
156 (r'^ saved backup bundle to \$TESTTMP.*\.hg$', winglobmsg),
154 (r'^ changeset .* references (corrupted|missing) \$TESTTMP/.*[^)]$',
157 (r'^ changeset .* references (corrupted|missing) \$TESTTMP/.*[^)]$',
155 winglobmsg),
158 winglobmsg),
@@ -565,7 +565,7 b' unshelve and conflicts with untracked fi'
565 $ hg shelve
565 $ hg shelve
566 shelved as default
566 shelved as default
567 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
567 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
568 $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle:.hg/shelved/default.hg -r 'bundle()'
568 $ hg log -G --template '{rev} {desc|firstline} {author}' -R bundle://.hg/shelved/default.hg -r 'bundle()'
569 o 4 changes to 'commit stuff' shelve@localhost
569 o 4 changes to 'commit stuff' shelve@localhost
570 |
570 |
571 $ hg log -G --template '{rev} {desc|firstline} {author}'
571 $ hg log -G --template '{rev} {desc|firstline} {author}'
General Comments 0
You need to be logged in to leave comments. Login now