Rev 607: Set bzr-svn mapping version in svn revprops. in file:///data/jelmer/bzr-svn/revprops/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 607
revision-id:jelmer at samba.org-20071215154446-hyk9gnepf89sz2oi
parent: jelmer at samba.org-20071215152130-rwm2qf4r2z1pz8w9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Sat 2007-12-15 16:44:46 +0100
message:
  Set bzr-svn mapping version in svn revprops.
modified:
  BRANCH.TODO                    branch.todo-20070721175243-w23kkak0gm2jbr8b-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2007-12-15 15:21:30 +0000
+++ b/BRANCH.TODO	2007-12-15 15:44:46 +0000
@@ -11,6 +11,7 @@
 * bzr:properties:branch-nick
 * bzr:properties:*
 * bzr:root
+* bzr:mapping-version
 
 bzr-svn should not be looking at any file properties set on the branch root if any 
 of these revision properties is set.

=== modified file 'commit.py'
--- a/commit.py	2007-12-15 15:21:30 +0000
+++ b/commit.py	2007-12-15 15:44:46 +0000
@@ -34,11 +34,12 @@
                         SVN_PROP_SVK_MERGE, SVN_PROP_BZR_REVISION_INFO, 
                         SVN_PROP_BZR_REVISION_ID, revision_id_to_svk_feature,
                         generate_revision_metadata, SvnRepositoryFormat, 
-                        SvnRepository,
+                        SvnRepository, MAPPING_VERSION,
                         SVN_REVPROP_BZR_COMMITTER, SVN_REVPROP_BZR_FILEIDS,
                         SVN_REVPROP_BZR_MERGE, SVN_REVPROP_BZR_REVISION_ID,
                         SVN_REVPROP_BZR_REVPROP_PREFIX, SVN_REVPROP_BZR_ROOT,
-                        SVN_REVPROP_BZR_TIMESTAMP, SVN_REVPROP_BZR_TIMEZONE)
+                        SVN_REVPROP_BZR_TIMESTAMP, SVN_REVPROP_BZR_TIMEZONE,
+                        SVN_REVPROP_BZR_MAPPING_VERSION)
 import urllib
 
 
@@ -104,7 +105,7 @@
             timestamp, timezone, committer, revprops)
         self._svnprops[SVN_PROP_BZR_FILEIDS] = ""
 
-        self._svn_revprops = {}
+        self._svn_revprops = {SVN_REVPROP_BZR_MAPPING_VERSION: str(MAPPING_VERSION)}
 
         if timestamp is not None:
             self._svn_revprops[SVN_REVPROP_BZR_TIMESTAMP] = str(timestamp)

=== modified file 'repository.py'
--- a/repository.py	2007-12-15 15:21:30 +0000
+++ b/repository.py	2007-12-15 15:44:46 +0000
@@ -65,6 +65,7 @@
 SVN_REVPROP_BZR_SIGNATURE = 'bzr:gpg-signature'
 SVN_REVPROP_BZR_TIMESTAMP = 'bzr:timestamp'
 SVN_REVPROP_BZR_TIMEZONE = 'bzr:timezone'
+SVN_REVPROP_BZR_MAPPING_VERSION = 'bzr:mapping-version'
 
 # The following two functions don't use day names (which can vary by 
 # locale) unlike the alternatives in bzrlib.timestamp