/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Andrew Bennetts
  • Date: 2011-06-02 07:25:33 UTC
  • mfrom: (5952 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5955.
  • Revision ID: andrew.bennetts@canonical.com-20110602072533-v0pe1ivh27cp0pd8
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1855
1855
                    self._observed_sha1s[trans_id] = (o_sha1, st)
1856
1856
        finally:
1857
1857
            child_pb.finished()
1858
 
        for trans_id in self._new_contents:
1859
 
            del self._limbo_files[trans_id]
 
1858
        for path, trans_id in new_paths:
 
1859
            # new_paths includes stuff like workingtree conflicts. Only the
 
1860
            # stuff in new_contents actually comes from limbo.
 
1861
            if trans_id in self._limbo_files:
 
1862
                del self._limbo_files[trans_id]
1860
1863
        self._new_contents.clear()
1861
1864
        return modified_paths
1862
1865
 
2584
2587
            precomputed_delta = None
2585
2588
        conflicts = cook_conflicts(raw_conflicts, tt)
2586
2589
        for conflict in conflicts:
2587
 
            trace.warning(conflict)
 
2590
            trace.warning(unicode(conflict))
2588
2591
        try:
2589
2592
            wt.add_conflicts(conflicts)
2590
2593
        except errors.UnsupportedOperation:
2826
2829
                unversioned_filter=working_tree.is_ignored)
2827
2830
            delta.report_changes(tt.iter_changes(), change_reporter)
2828
2831
        for conflict in conflicts:
2829
 
            trace.warning(conflict)
 
2832
            trace.warning(unicode(conflict))
2830
2833
        pp.next_phase()
2831
2834
        tt.apply()
2832
2835
        working_tree.set_merge_modified(merge_modified)