##// END OF EJS Templates
convert: only consider shamap revisions converted if they still exists...
Mads Kiilerich -
r21636:3de9f2c4 default
parent child Browse files
Show More
@@ -173,8 +173,12 b' class converter(object):'
173 parents = {}
173 parents = {}
174 while visit:
174 while visit:
175 n = visit.pop(0)
175 n = visit.pop(0)
176 if n in known or n in self.map:
176 if n in known:
177 continue
177 continue
178 if n in self.map:
179 m = self.map[n]
180 if m == SKIPREV or self.dest.hascommitfrommap(m):
181 continue
178 known.add(n)
182 known.add(n)
179 self.ui.progress(_('scanning'), len(known), unit=_('revisions'))
183 self.ui.progress(_('scanning'), len(known), unit=_('revisions'))
180 commit = self.cachecommit(n)
184 commit = self.cachecommit(n)
@@ -526,8 +526,11 b' Conversion after rollback'
526 scanning source...
526 scanning source...
527 sorting...
527 sorting...
528 converting...
528 converting...
529 0 extra f+a-only change
529
530
530 $ hg -R a log -G -T '{rev} {desc|firstline} ({files})\n'
531 $ hg -R a log -G -T '{rev} {desc|firstline} ({files})\n'
532 o 3 extra f+a-only change (f)
533 |
531 o 2 x (f)
534 o 2 x (f)
532 |
535 |
533 @ 1 a (f)
536 @ 1 a (f)
General Comments 0
You need to be logged in to leave comments. Login now