equal
deleted
inserted
replaced
2639 self.ui.warn(_("trouble committing %s!\n") % |
2639 self.ui.warn(_("trouble committing %s!\n") % |
2640 uipathfn(f)) |
2640 uipathfn(f)) |
2641 raise |
2641 raise |
2642 |
2642 |
2643 # update manifest |
2643 # update manifest |
2644 removed = [f for f in sorted(removed) if f in m1 or f in m2] |
2644 removed = [f for f in removed if f in m1 or f in m2] |
2645 drop = [f for f in removed if f in m] |
2645 drop = sorted([f for f in removed if f in m]) |
2646 for f in drop: |
2646 for f in drop: |
2647 del m[f] |
2647 del m[f] |
2648 files = changed + removed |
2648 files = changed + removed |
2649 md = None |
2649 md = None |
2650 if not files: |
2650 if not files: |