Rev 2903: Remove bad assertions from WorkingTree4._add in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Oct 10 03:31:38 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2903
revision-id: pqm at pqm.ubuntu.com-20071010023136-u18s3z51ux7pwsme
parent: pqm at pqm.ubuntu.com-20071010014853-syu149i5axrvovt1
parent: mbp at sourcefrog.net-20071009062804-96edl56w6c7x5y1c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-10 03:31:36 +0100
message:
  Remove bad assertions from WorkingTree4._add
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2898.1.1
    merged: mbp at sourcefrog.net-20071009062804-96edl56w6c7x5y1c
    parent: pqm at pqm.ubuntu.com-20071009044446-uliu5z9a52bzmps8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 145027-assertions
    timestamp: Tue 2007-10-09 16:28:04 +1000
    message:
      Remove bad assertions from WorkingTree4._add
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-10-08 07:29:57 +0000
+++ b/bzrlib/workingtree_4.py	2007-10-09 06:28:04 +0000
@@ -158,8 +158,6 @@
         state = self.current_dirstate()
         for f, file_id, kind in zip(files, ids, kinds):
             f = f.strip('/')
-            assert '//' not in f
-            assert '..' not in f
             if self.path2id(f):
                 # special case tree root handling.
                 if f == '' and self.path2id(f) == ROOT_ID:




More information about the bazaar-commits mailing list