499                 changed.append(f)

   499                 changed.append(f)

   500                 if update_dirstate:

   500                 if update_dirstate:

   501                     self.dirstate.update([f], "n")

   501                     self.dirstate.update([f], "n")

   502             except IOError:

   502             except IOError:

   503                 try:

   503                 try:

   505                     del m1[f]

   504                     del m1[f]

   506                     if update_dirstate:

   505                     if update_dirstate:

   507                         self.dirstate.forget([f])

   506                         self.dirstate.forget([f])

   508                 except:

   507                 except:

   509                     # deleted from p2?

   508                     # deleted from p2?