/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/conflicts.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 13:21:46 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615132146-52wlrhfezohakpd7
Get closer to the exception even if this means ~duplicating tt.trans_id_tree_path to make the code clearer (suggested by jam).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
597
597
            # where the user deleted it)
598
598
            pass
599
599
        try:
600
 
            this_tid = tt.trans_id_tree_file_id(self.file_id)
 
600
            this_path = tt._tree.id2path(self.file_id)
601
601
        except errors.NoSuchId:
602
602
            # The file is not present anymore. This may happen if the user
603
603
            # deleted the file either manually or when resolving a conflict on
604
604
            # the parent.  We may raise some exception to indicate that the
605
605
            # conflict doesn't exist anymore and as such doesn't need to be
606
 
            # resolved ? -- vila 20110615
 
606
            # resolved ? -- vila 20110615 
607
607
            this_tid = None
 
608
        else:
 
609
            this_tid = tt.trans_id_tree_path(this_path)
608
610
        if this_tid is not None:
609
611
            # Rename 'item.suffix_to_remove' (note that if
610
612
            # 'item.suffix_to_remove' has been deleted, this is a no-op)