159     error,

   159     error,

   160     obsolete,

   160     obsolete,

   161     phases,

   161     phases,

   162     pushkey,

   162     pushkey,

   163     pycompat,

   163     pycompat,

   164     tags,

   165     tags,

   165     url,

   166     url,

   166     util,

   167     util,

   167 )

   168 )

   168 

   169 

  1808     new = op.repo.obsstore.mergemarkers(tr, markerdata)

  1809     new = op.repo.obsstore.mergemarkers(tr, markerdata)

  1809     op.repo.invalidatevolatilesets()

  1810     op.repo.invalidatevolatilesets()

  1810     if new:

  1811     if new:

  1811         op.repo.ui.status(_('%i new obsolescence markers\n') % new)

  1812         op.repo.ui.status(_('%i new obsolescence markers\n') % new)

  1812     op.records.add('obsmarkers', {'new': new})

  1813     op.records.add('obsmarkers', {'new': new})

  1813     if op.reply is not None:

  1815     if op.reply is not None:

  1814         rpart = op.reply.newpart('reply:obsmarkers')

  1816         rpart = op.reply.newpart('reply:obsmarkers')

  1815         rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)

  1817         rpart.addparam('in-reply-to', str(inpart.id), mandatory=False)

  1816         rpart.addparam('new', '%i' % new, mandatory=False)

  1818         rpart.addparam('new', '%i' % new, mandatory=False)

  1817 

  1819