hgext/histedit.py
changeset 27406 11be6b7f95da
parent 27405 5837ca674da9
child 27407 bf4d5d8dc2aa
equal deleted inserted replaced
27405:5837ca674da9 27406:11be6b7f95da
  1079         parentctx, replacement_ = actobj.run()
  1079         parentctx, replacement_ = actobj.run()
  1080         state.parentctxnode = parentctx.node()
  1080         state.parentctxnode = parentctx.node()
  1081         state.replacements.extend(replacement_)
  1081         state.replacements.extend(replacement_)
  1082     state.write()
  1082     state.write()
  1083 
  1083 
  1084     hg.update(repo, state.parentctxnode)
  1084     hg.update(repo, state.parentctxnode, quietempty=True)
  1085 
  1085 
  1086     mapping, tmpnodes, created, ntm = processreplacement(state)
  1086     mapping, tmpnodes, created, ntm = processreplacement(state)
  1087     if mapping:
  1087     if mapping:
  1088         for prec, succs in mapping.iteritems():
  1088         for prec, succs in mapping.iteritems():
  1089             if not succs:
  1089             if not succs: