201                   (short(p1), short(p2), short(pa)))

   201                   (short(p1), short(p2), short(pa)))

   202 

   202 

   203     action = []

   203     action = []

   204 

   204 

   205     # update m1 from working dir

   205     # update m1 from working dir

   208     for i,l in (("a", added), ("m", modified), ("u", unknown)):

   206     for i,l in (("a", added), ("m", modified), ("u", unknown)):

   209         for f in l:

   207         for f in l:

   210             m1[f] = m1.get(f, nullid) + i

   208             m1[f] = m1.get(f, nullid) + i

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

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

   212 

   210