Show More
@@ -136,7 +136,7 b' def grouptagnodesbyline(tagnodes):' | |||
|
136 | 136 | prevlinenum = linenum |
|
137 | 137 | return groupednodes |
|
138 | 138 | |
|
139 |
def writemergedtags( |
|
|
139 | def writemergedtags(fcd, mergedtags): | |
|
140 | 140 | ''' |
|
141 | 141 | write the merged tags while trying to minimize the diff to the first parent |
|
142 | 142 | |
@@ -169,9 +169,7 b' def writemergedtags(repo, mergedtags):' | |||
|
169 | 169 | # finally we can join the sorted groups to get the final contents of the |
|
170 | 170 | # merged .hgtags file, and then write it to disk |
|
171 | 171 | mergedtagstring = '\n'.join([tags for rank, tags in finaltags if tags]) |
|
172 | fp = repo.wvfs('.hgtags', 'wb') | |
|
173 | fp.write(mergedtagstring + '\n') | |
|
174 | fp.close() | |
|
172 | fcd.write(mergedtagstring + '\n', fcd.flags()) | |
|
175 | 173 | |
|
176 | 174 | def singletagmerge(p1nodes, p2nodes): |
|
177 | 175 | ''' |
@@ -268,7 +266,7 b' def merge(repo, fcd, fco, fca):' | |||
|
268 | 266 | % (numconflicts, ', '.join(sorted(conflictedtags)))) |
|
269 | 267 | return True, 1 |
|
270 | 268 | |
|
271 |
writemergedtags( |
|
|
269 | writemergedtags(fcd, mergedtags) | |
|
272 | 270 | ui.note(_('.hgtags merged successfully\n')) |
|
273 | 271 | return False, 0 |
|
274 | 272 |
General Comments 0
You need to be logged in to leave comments.
Login now