hg
changeset 124 0f6c49138f67
parent 123 b93cc016eec9
child 129 1db9207def07
equal deleted inserted replaced
123:b93cc016eec9 124:0f6c49138f67
   405             r = repo.changelog.rev(n)
   405             r = repo.changelog.rev(n)
   406         except KeyError:
   406         except KeyError:
   407             r = "?"
   407             r = "?"
   408         print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
   408         print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
   409 
   409 
   410 elif cmd == "debugoldmerge":
       
   411     if args:
       
   412         other = hg.repository(ui, args[0])
       
   413         repo.merge(other)
       
   414     else:
       
   415         print "missing source repository"
       
   416 
       
   417 elif cmd == "verify":
   410 elif cmd == "verify":
   418     filelinkrevs = {}
   411     filelinkrevs = {}
   419     filenodes = {}
   412     filenodes = {}
   420     manifestchangeset = {}
   413     manifestchangeset = {}
   421     changesets = revisions = files = 0
   414     changesets = revisions = files = 0