121     for f in added + modified + unknown:

   121     for f in added + modified + unknown:

   122         m1[f] = m1.get(f, nullid) + "+"

   122         m1[f] = m1.get(f, nullid) + "+"

   123         m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))

   123         m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))

   124 

   124 

   125     for f in deleted + removed:

   125     for f in deleted + removed:

   128 

   127 

   129         # If we're jumping between revisions (as opposed to merging),

   128         # If we're jumping between revisions (as opposed to merging),

   130         # and if neither the working directory nor the target rev has

   129         # and if neither the working directory nor the target rev has

   131         # the file, then we need to remove it from the dirstate, to

   130         # the file, then we need to remove it from the dirstate, to

   132         # prevent the dirstate from listing the file when it is no

   131         # prevent the dirstate from listing the file when it is no