mercurial/cmdutil.py

25709:c87373179ff3

                    for bm in bms:
                        ui.debug('moving bookmarks %r from %s to %s\n' %
                                 (marks, old.hex(), hex(newid)))
                        marks[bm] = newid
                    marks.recordchange(tr)
            #commit the whole amend process
            if createmarkers and newid != old.node():
                # mark the new changeset as successor of the rewritten one
                new = repo[newid]
                obs = [(old, (new,))]
                if node:
                    obs.append((ctx, ()))

                obsolete.createmarkers(repo, obs)
            tr.close()
        finally:
            tr.release()
        dsguard.close()
        if not createmarkers and newid != old.node():

25710:68c83b8d407a

                    for bm in bms:
                        ui.debug('moving bookmarks %r from %s to %s\n' %
                                 (marks, old.hex(), hex(newid)))
                        marks[bm] = newid
                    marks.recordchange(tr)
                #commit the whole amend process
                if createmarkers:
                    # mark the new changeset as successor of the rewritten one
                    new = repo[newid]
                    obs = [(old, (new,))]
                    if node:
                        obs.append((ctx, ()))

                    obsolete.createmarkers(repo, obs)
            tr.close()
        finally:
            tr.release()
        dsguard.close()
        if not createmarkers and newid != old.node():