← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: John Arbash Meinel
  • Date: 2011-06-01 08:59:17 UTC
  • mto: This revision was merged to the branch mainline in revision 5948.
  • Revision ID: john@arbash-meinel.com-20110601085917-fgsyq3nnut6navd4
Can't just delete trans_id in new_paths because some don't come from limbo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1849
1849
                    self._observed_sha1s[trans_id] = (o_sha1, st)
1850
1850
        finally:
1851
1851
            child_pb.finished()
1852
 
        for trans_id in self._new_contents:
1853
 
            del self._limbo_files[trans_id]
 
1852
        for path, trans_id in new_paths:
 
1853
            # new_paths includes stuff like workingtree conflicts. Only the
 
1854
            # stuff in new_contents actually comes from limbo.
 
1855
            if trans_id in self._limbo_files:
 
1856
                del self._limbo_files[trans_id]
1854
1857
        self._new_contents.clear()
1855
1858
        return modified_paths
1856
1859