mercurial/merge.py
changeset 18329 eb6ca96f4dd0
parent 18328 2fee5119099b
child 18330 b717f49833a2
equal deleted inserted replaced
18328:2fee5119099b 18329:eb6ca96f4dd0
   316                 act("prompt recreating", "g", f, m2.flags(f))
   316                 act("prompt recreating", "g", f, m2.flags(f))
   317 
   317 
   318     return action
   318     return action
   319 
   319 
   320 def actionkey(a):
   320 def actionkey(a):
   321     return a[1] == 'r' and -1 or 0, a
   321     return a[1] == "r" and -1 or 0, a
   322 
   322 
   323 def applyupdates(repo, action, wctx, mctx, actx, overwrite):
   323 def applyupdates(repo, action, wctx, mctx, actx, overwrite):
   324     """apply the merge action list to the working directory
   324     """apply the merge action list to the working directory
   325 
   325 
   326     wctx is the working copy context
   326     wctx is the working copy context
   338     action.sort(key=actionkey)
   338     action.sort(key=actionkey)
   339 
   339 
   340     # prescan for merges
   340     # prescan for merges
   341     for a in action:
   341     for a in action:
   342         f, m = a[:2]
   342         f, m = a[:2]
   343         if m == 'm': # merge
   343         if m == "m": # merge
   344             f2, fd, flags, move = a[2:]
   344             f2, fd, flags, move = a[2:]
   345             if f == '.hgsubstate': # merged internally
   345             if f == '.hgsubstate': # merged internally
   346                 continue
   346                 continue
   347             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
   347             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
   348             fcl = wctx[f]
   348             fcl = wctx[f]