220         if k in m1:

   220         if k in m1:

   221             if v in m1 or v in m2:

   221             if v in m1 or v in m2:

   222                 repo.dirstate.copy(v, k)

   222                 repo.dirstate.copy(v, k)

   223                 if v in m2 and v not in m1:

   223                 if v in m2 and v not in m1:

   224                     repo.dirstate.remove(v)

   224                     repo.dirstate.remove(v)

   226     newrev = concludenode(repo, rev, p1, p2, state, collapse,

   226     newrev = concludenode(repo, rev, p1, p2, state, collapse,

   227                           extrafn=extrafn)

   227                           extrafn=extrafn)

   228 

   228 

   229     # Update the state

   229     # Update the state

   230     if newrev is not None:

   230     if newrev is not None: