Show More
@@ -419,7 +419,7 b' def parsesplicemap(path):' | |||||
419 | fp = open(path, 'r') |
|
419 | fp = open(path, 'r') | |
420 | for i, line in enumerate(fp): |
|
420 | for i, line in enumerate(fp): | |
421 | try: |
|
421 | try: | |
422 |
child, parents = line.splitlines()[0].rstrip(). |
|
422 | child, parents = line.splitlines()[0].rstrip().split(' ', 1) | |
423 | parents = parents.replace(',', ' ').split() |
|
423 | parents = parents.replace(',', ' ').split() | |
424 | except ValueError: |
|
424 | except ValueError: | |
425 | raise util.Abort(_('syntax error in %s(%d): child parent1' |
|
425 | raise util.Abort(_('syntax error in %s(%d): child parent1' |
@@ -123,11 +123,11 b' We want 2 to depend on 1 and 3. Since 3 ' | |||||
123 | the bug should be exhibited with all conversion orders. |
|
123 | the bug should be exhibited with all conversion orders. | |
124 |
|
124 | |||
125 | $ cat > ../splicemap <<EOF |
|
125 | $ cat > ../splicemap <<EOF | |
126 | > $(hg id -r 2 -i --debug) $(hg id -r 1 -i --debug),$(hg id -r 3 -i --debug) |
|
126 | > $(hg id -r 2 -i --debug) $(hg id -r 1 -i --debug), $(hg id -r 3 -i --debug) | |
127 | > EOF |
|
127 | > EOF | |
128 | $ cd .. |
|
128 | $ cd .. | |
129 | $ cat splicemap |
|
129 | $ cat splicemap | |
130 | 7c364e7fa7d70ae525610c016317ed717b519d97 717d54d67e6c31fd75ffef2ff3042bdd98418437,102a90ea7b4a3361e4082ed620918c261189a36a |
|
130 | 7c364e7fa7d70ae525610c016317ed717b519d97 717d54d67e6c31fd75ffef2ff3042bdd98418437, 102a90ea7b4a3361e4082ed620918c261189a36a | |
131 |
|
131 | |||
132 | Test regular conversion |
|
132 | Test regular conversion | |
133 |
|
133 |
General Comments 0
You need to be logged in to leave comments.
Login now