Show More
@@ -74,6 +74,7 b' testfilters = [' | |||||
74 | uprefix = r"^ \$ " |
|
74 | uprefix = r"^ \$ " | |
75 | uprefixc = r"^ > " |
|
75 | uprefixc = r"^ > " | |
76 | utestpats = [ |
|
76 | utestpats = [ | |
|
77 | (r'^(\S| $ ).*(\S\s+|^\s+)\n', "trailing whitespace on non-output"), | |||
77 | (uprefix + r'.*\|\s*sed', "use regex test output patterns instead of sed"), |
|
78 | (uprefix + r'.*\|\s*sed', "use regex test output patterns instead of sed"), | |
78 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), |
|
79 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), | |
79 | (uprefix + r'.*\$\?', "explicit exit code checks unnecessary"), |
|
80 | (uprefix + r'.*\$\?', "explicit exit code checks unnecessary"), |
@@ -42,7 +42,7 b' Branch the project' | |||||
42 | $ cvscall up -r BRANCH > /dev/null |
|
42 | $ cvscall up -r BRANCH > /dev/null | |
43 | cvs update: Updating . |
|
43 | cvs update: Updating . | |
44 |
|
44 | |||
45 |
Modify file a, then b, then a |
|
45 | Modify file a, then b, then a | |
46 |
|
46 | |||
47 | $ sleep 1 |
|
47 | $ sleep 1 | |
48 | $ echo "2" > a |
|
48 | $ echo "2" > a |
@@ -336,7 +336,7 b' Using --new-branch to push new named bra' | |||||
336 | added 1 changesets with 1 changes to 1 files |
|
336 | added 1 changesets with 1 changes to 1 files | |
337 |
|
337 | |||
338 |
|
338 | |||
339 |
Checking prepush logic does not allow silently pushing |
|
339 | Checking prepush logic does not allow silently pushing | |
340 | multiple new heads: |
|
340 | multiple new heads: | |
341 |
|
341 | |||
342 | $ cd .. |
|
342 | $ cd .. | |
@@ -480,7 +480,7 b' in the clone b1 is now the head of B' | |||||
480 | $ hg ci -Ama2 |
|
480 | $ hg ci -Ama2 | |
481 | adding a2 |
|
481 | adding a2 | |
482 |
|
482 | |||
483 |
a2 is now the new branch head of A, and a new topological head |
|
483 | a2 is now the new branch head of A, and a new topological head | |
484 | it replaces a former inner branch head, so it should at most warn about |
|
484 | it replaces a former inner branch head, so it should at most warn about | |
485 | A, not B |
|
485 | A, not B | |
486 |
|
486 |
General Comments 0
You need to be logged in to leave comments.
Login now