Rev 6583: We don't need 2 files to test it. One works just fine. in http://bazaar.launchpad.net/~jameinel/bzr/dirstate-invalid-delta-855155

John Arbash Meinel john at arbash-meinel.com
Tue May 28 08:04:48 UTC 2013


At http://bazaar.launchpad.net/~jameinel/bzr/dirstate-invalid-delta-855155

------------------------------------------------------------
revno: 6583
revision-id: john at arbash-meinel.com-20130528080440-mdcb9de6es66w3lr
parent: john at arbash-meinel.com-20130528080251-a6nybtb8mxr9vrlw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate-invalid-delta-855155
timestamp: Tue 2013-05-28 09:04:40 +0100
message:
  We don't need 2 files to test it. One works just fine.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_workingtree/test_parents.py'
--- a/bzrlib/tests/per_workingtree/test_parents.py	2013-05-28 07:50:20 +0000
+++ b/bzrlib/tests/per_workingtree/test_parents.py	2013-05-28 08:04:40 +0000
@@ -777,7 +777,5 @@
         self.add_dir(new_shape, old_revid, 'dir-id-A', 'root-id', 'A')
         self.add_file(new_shape, new_revid, 'file-id-B', 'dir-id-A', 'B',
             '1' * 32, 24)
-        self.add_file(new_shape, new_revid, 'file-id-C', 'dir-id-A', 'C',
-            '2' * 32, 24)
         self.assertTransitionFromBasisToShape(basis_shape, old_revid,
                 new_shape, new_revid, set_current_inventory=False)



More information about the bazaar-commits mailing list