13 import shutil

    13 import shutil

    14 import struct

    14 import struct

    15 

    15 

    16 from .i18n import _

    16 from .i18n import _

    17 from .node import (

    17 from .node import (

    18     bin,

    19     bin,

    19     hex,

    20     hex,

    20     nullhex,

    21     nullhex,

    21     nullid,

    22     nullid,

    22     nullrev,

    23     nullrev,

   871                     if acceptremote:

   872                     if acceptremote:

   872                         actions[f] = ('r', None, "remote delete")

   873                         actions[f] = ('r', None, "remote delete")

   873                     else:

   874                     else:

   874                         actions[f] = ('cd', (f, None, f, False, pa.node()),

   875                         actions[f] = ('cd', (f, None, f, False, pa.node()),

   875                                       "prompt changed/deleted")

   876                                       "prompt changed/deleted")

   877                     # This extra 'a' is added by working copy manifest to mark

   878                     # This extra 'a' is added by working copy manifest to mark

   878                     # the file as locally added. We should forget it instead of

   879                     # the file as locally added. We should forget it instead of

   879                     # deleting it.

   880                     # deleting it.

   880                     actions[f] = ('f', None, "remote deleted")

   881                     actions[f] = ('f', None, "remote deleted")

   881                 else:

   882                 else: