Rev 1779: Fix data. in file:///data/jelmer/bzr-svn/trunk/

Jelmer Vernooij jelmer at samba.org
Tue Sep 2 04:40:33 BST 2008


At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1779
revision-id: jelmer at samba.org-20080902034031-trhsns72i57wmmcg
parent: jelmer at samba.org-20080902023136-b7xq7b9aocba1023
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-02 05:40:31 +0200
message:
  Fix data.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  tests/mapping_implementations/test_repository.py test_repository.py-20080902013845-ity7d1ymye69sobm-2
=== modified file 'mapping.py'
--- a/mapping.py	2008-09-02 01:49:29 +0000
+++ b/mapping.py	2008-09-02 03:40:31 +0000
@@ -354,7 +354,7 @@
         :param branch: Branch path of the branch in which the file was introduced.
         :param inv_path: Original path of the file within the inventory
         """
-        raise NotImplementedError(self.generate_file_id)
+        raise NotImplementedError
 
     def import_revision(self, revprops, fileprops, uuid, branch, revnum, rev):
         """Update a Revision object from Subversion revision and branch 

=== modified file 'tests/mapping_implementations/test_repository.py'
--- a/tests/mapping_implementations/test_repository.py	2008-09-02 02:31:36 +0000
+++ b/tests/mapping_implementations/test_repository.py	2008-09-02 03:40:31 +0000
@@ -88,6 +88,8 @@
         repos_url = self.make_repository("a")
         repos = Repository.open(repos_url)
         mapping = repos.get_mapping()
+        if mapping.supports_roundtripping():
+            raise TestNotApplicable()
         self.assertEqual({u"": (mapping.generate_file_id(repos.uuid, 0, "", u""), mapping.revision_id_foreign_to_bzr((repos.uuid, 0, "")))}, repos.get_fileid_map(0, "", mapping))
 
     def test_generate_revision_id_forced_revid(self):




More information about the bazaar-commits mailing list