comparison mercurial/commands.py @ 6001:30d2fecaab76

merge with crew-stable

6000:8e7d64989bb8

                    if opts.get('exact'):
                        if hex(n) != nodeid:
                            repo.rollback()
                            raise util.Abort(_('patch is damaged'
                                               ' or loses information'))
            finally:
                os.unlink(tmpname)
    finally:
        del lock, wlock

6001:30d2fecaab76

                    if opts.get('exact'):
                        if hex(n) != nodeid:
                            repo.rollback()
                            raise util.Abort(_('patch is damaged'
                                               ' or loses information'))
                    # Force a dirstate write so that the next transaction
                    # backups an up-do-date file.
                    repo.dirstate.write()
            finally:
                os.unlink(tmpname)
    finally:
        del lock, wlock