Show More
@@ -508,9 +508,15 b' def createchangeset(ui, log, fuzz=60, me' | |||
|
508 | 508 | |
|
509 | 509 | ui.status(_('creating changesets\n')) |
|
510 | 510 | |
|
511 | # try to order commitids by date | |
|
512 | mindate = {} | |
|
513 | for e in log: | |
|
514 | if e.commitid: | |
|
515 | mindate[e.commitid] = min(e.date, mindate.get(e.commitid)) | |
|
516 | ||
|
511 | 517 | # Merge changesets |
|
512 |
log.sort(key=lambda x: (x.commitid, x.comment, |
|
|
513 | x.branchpoints)) | |
|
518 | log.sort(key=lambda x: (mindate.get(x.commitid), x.commitid, x.comment, | |
|
519 | x.author, x.branch, x.date, x.branchpoints)) | |
|
514 | 520 | |
|
515 | 521 | changesets = [] |
|
516 | 522 | files = set() |
General Comments 0
You need to be logged in to leave comments.
Login now