Rev 5412: Clarify b.transform.conflict_pass. in file:///home/vila/src/bzr/bugs/323111-orphans/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/323111-orphans/

------------------------------------------------------------
revno: 5412
revision-id: v.ladeuil+lp at free.fr-20100907074800-hdga1p5qo0spm356
parent: v.ladeuil+lp at free.fr-20100906143602-chi2b11wd77ave21
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Tue 2010-09-07 09:48:00 +0200
message:
  Clarify b.transform.conflict_pass.
  
  * bzrlib/transform.py:
  (conflict_pass): Explicitly check for the trans_id in
  _removed_contents so newbies don't have to guess where the
  KeyError is coming from.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2010-08-27 07:54:21 +0000
+++ b/bzrlib/transform.py	2010-09-07 07:48:00 +0000
@@ -2799,11 +2799,11 @@
 
         elif c_type == 'missing parent':
             trans_id = conflict[1]
-            try:
+            if trans_id in tt._removed_contents:
                 tt.cancel_deletion(trans_id)
                 new_conflicts.add(('deleting parent', 'Not deleting',
                                    trans_id))
-            except KeyError:
+            else:
                 create = True
                 try:
                     tt.final_name(trans_id)