Lines 124-134
Link Here
|
124 |
|
124 |
|
125 |
for i in range(0, max(len(list1), len(list2))): |
125 |
for i in range(0, max(len(list1), len(list2))): |
126 |
if len(list1) <= i: |
126 |
if len(list1) <= i: |
127 |
s1 = ("p","0") |
127 |
s1 = ("p","-2") |
128 |
else: |
128 |
else: |
129 |
s1 = suffix_regexp.match(list1[i]).groups() |
129 |
s1 = suffix_regexp.match(list1[i]).groups() |
130 |
if len(list2) <= i: |
130 |
if len(list2) <= i: |
131 |
s2 = ("p","0") |
131 |
s2 = ("p","-2") |
132 |
else: |
132 |
else: |
133 |
s2 = suffix_regexp.match(list2[i]).groups() |
133 |
s2 = suffix_regexp.match(list2[i]).groups() |
134 |
if s1[0] != s2[0]: |
134 |
if s1[0] != s2[0]: |
Lines 137-145
Link Here
|
137 |
# it's possible that the s(1|2)[1] == '' |
137 |
# it's possible that the s(1|2)[1] == '' |
138 |
# in such a case, fudge it. |
138 |
# in such a case, fudge it. |
139 |
try: r1 = int(s1[1]) |
139 |
try: r1 = int(s1[1]) |
140 |
except ValueError: r1 = 0 |
140 |
except ValueError: r1 = -1 |
141 |
try: r2 = int(s2[1]) |
141 |
try: r2 = int(s2[1]) |
142 |
except ValueError: r2 = 0 |
142 |
except ValueError: r2 = -1 |
143 |
return r1 - r2 |
143 |
return r1 - r2 |
144 |
|
144 |
|
145 |
# the suffix part is equal to, so finally check the revision |
145 |
# the suffix part is equal to, so finally check the revision |