Show More
@@ -370,6 +370,7 b' test-strip.t' | |||||
370 | test-subrepo-deep-nested-change.t |
|
370 | test-subrepo-deep-nested-change.t | |
371 | test-subrepo.t |
|
371 | test-subrepo.t | |
372 | test-symlinks.t |
|
372 | test-symlinks.t | |
|
373 | test-tag.t | |||
373 | test-treemanifest.t |
|
374 | test-treemanifest.t | |
374 | test-unamend.t |
|
375 | test-unamend.t | |
375 | test-uncommit.t |
|
376 | test-uncommit.t |
@@ -73,8 +73,6 b'' | |||||
73 |
|
73 | |||
74 | from __future__ import absolute_import |
|
74 | from __future__ import absolute_import | |
75 |
|
75 | |||
76 | import operator |
|
|||
77 |
|
||||
78 | from .i18n import _ |
|
76 | from .i18n import _ | |
79 | from .node import ( |
|
77 | from .node import ( | |
80 | hex, |
|
78 | hex, | |
@@ -164,7 +162,7 b' def writemergedtags(fcd, mergedtags):' | |||||
164 | # before writing them |
|
162 | # before writing them | |
165 | # the position is calculated to ensure that the diff of the merged .hgtags |
|
163 | # the position is calculated to ensure that the diff of the merged .hgtags | |
166 | # file to the first parent's .hgtags file is as small as possible |
|
164 | # file to the first parent's .hgtags file is as small as possible | |
167 | finaltags.sort(key=operator.itemgetter(0)) |
|
165 | finaltags.sort(key=lambda x: -1 if x[0] is None else x[0]) | |
168 |
|
166 | |||
169 | # finally we can join the sorted groups to get the final contents of the |
|
167 | # finally we can join the sorted groups to get the final contents of the | |
170 | # merged .hgtags file, and then write it to disk |
|
168 | # merged .hgtags file, and then write it to disk |
General Comments 0
You need to be logged in to leave comments.
Login now