Show More
@@ -53,6 +53,7 b' testpats = [' | |||
|
53 | 53 | (r'\$PWD', "don't use $PWD, use `pwd`"), |
|
54 | 54 | (r'[^\n]\Z', "no trailing newline"), |
|
55 | 55 | (r'export.*=', "don't export and assign at once"), |
|
56 | ('^([^"\']|("[^"]*")|(\'[^\']*\'))*\\^', "^ must be quoted"), | |
|
56 | 57 | ] |
|
57 | 58 | |
|
58 | 59 | testfilters = [ |
@@ -30,7 +30,7 b' cd src' | |||
|
30 | 30 | dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null |
|
31 | 31 | baz add b |
|
32 | 32 | # HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead" |
|
33 | baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar | |
|
33 | baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v '^tar' | |
|
34 | 34 | |
|
35 | 35 | echo % create link file and modify a |
|
36 | 36 | ln -s ../a a-link |
@@ -110,7 +110,7 b' hg -R proj.hg glog --template "{rev} {de' | |||
|
110 | 110 | |
|
111 | 111 | echo "% convert to hg (#2: with merge detection)" |
|
112 | 112 | filterpath hg convert \ |
|
113 |
--config convert.cvsps.mergefrom= |
|
|
113 | --config convert.cvsps.mergefrom='"^MERGE from (\S+):"' \ | |
|
114 | 114 | --datesort \ |
|
115 | 115 | proj proj.hg2 |
|
116 | 116 |
General Comments 0
You need to be logged in to leave comments.
Login now