Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/sparse.py
changeset 48713 5dfaca4464d1
parent 48665 a62ba3345534
child 48737 a6efb9180764
equal deleted inserted replaced
48712:773ad0f5152d 48713:5dfaca4464d1 
   394             prunedactions[file] = action
 
   394             prunedactions[file] = action
 
   395         elif type == mergestatemod.ACTION_MERGE:
 
   395         elif type == mergestatemod.ACTION_MERGE:
 
   396             temporaryfiles.append(file)
 
   396             temporaryfiles.append(file)
 
   397             prunedactions[file] = action
 
   397             prunedactions[file] = action
 
   398         elif branchmerge:
 
   398         elif branchmerge:
 
   399             if type not in mergestatemod.NO_OP_ACTIONS:
 
   399             if not type.no_op:
 
   400                 temporaryfiles.append(file)
 
   400                 temporaryfiles.append(file)
 
   401                 prunedactions[file] = action
 
   401                 prunedactions[file] = action
 
   402         elif type == mergestatemod.ACTION_FORGET:
 
   402         elif type == mergestatemod.ACTION_FORGET:
 
   403             prunedactions[file] = action
 
   403             prunedactions[file] = action
 
   404         elif file in wctx:
 
   404         elif file in wctx:
mercurial