equal
deleted
inserted
replaced
883 rewrote += 1 |
883 rewrote += 1 |
884 |
884 |
885 # create obsmarkers and move bookmarks |
885 # create obsmarkers and move bookmarks |
886 # XXX we should be creating marker as we go instead of only at the end, |
886 # XXX we should be creating marker as we go instead of only at the end, |
887 # this makes the operations more modulars |
887 # this makes the operations more modulars |
888 compat.cleanupnodes(repo, successors, 'changetopics') |
888 scmutil.cleanupnodes(repo, successors, 'changetopics') |
889 |
889 |
890 # move the working copy too |
890 # move the working copy too |
891 wctx = repo[None] |
891 wctx = repo[None] |
892 # in-progress merge is a bit too complex for now. |
892 # in-progress merge is a bit too complex for now. |
893 if len(wctx.parents()) == 1: |
893 if len(wctx.parents()) == 1: |