Rev 1686: Merge some fixes. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1686
revision-id: jelmer at samba.org-20080829102701-1983rtloixvei4ng
parent: jelmer at samba.org-20080828144626-xbfipu5srwx2a4u2
parent: jelmer at samba.org-20080829101059-7nq9t0ifwdz7cbtx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 12:27:01 +0200
message:
  Merge some fixes.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
  versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
    ------------------------------------------------------------
    revno: 1669.1.9
    revision-id: jelmer at samba.org-20080829101059-7nq9t0ifwdz7cbtx
    parent: jelmer at samba.org-20080829085504-2halcduygazwdl46
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-08-29 12:10:59 +0200
    message:
      Fix compatibility with bzr 1.7.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
    ------------------------------------------------------------
    revno: 1669.1.8
    revision-id: jelmer at samba.org-20080829085504-2halcduygazwdl46
    parent: jelmer at samba.org-20080828155955-9pf7dza4ll2iitel
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-08-29 10:55:04 +0200
    message:
      Fix warnings.
    modified:
      ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
      util.c                         util.c-20080531154025-s8ef6ej9tytsnkkw-1
    ------------------------------------------------------------
    revno: 1669.1.7
    revision-id: jelmer at samba.org-20080828155955-9pf7dza4ll2iitel
    parent: jelmer at samba.org-20080827182313-wpw7e6bh6zh79i10
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-08-28 17:59:55 +0200
    message:
      Fix contents of files when using stacked branching.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      versionedfiles.py              versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
=== modified file 'NEWS'
--- a/NEWS	2008-08-27 19:11:09 +0000
+++ b/NEWS	2008-08-29 10:27:01 +0000
@@ -6,6 +6,10 @@
 
    * Cope with svn+ prefix when setting tags. (#261748)
 
+   * Fix contents of files when using stacked branching. (#262314)
+
+   * Fix compatibility with Bazaar 1.7.
+
 bzr-svn 0.4.11	2008-08-26
 
 bzr-svn 0.4.11~rc2	2008-08-26

=== modified file 'ra.c'
--- a/ra.c	2008-08-27 18:23:13 +0000
+++ b/ra.c	2008-08-29 08:55:04 +0000
@@ -1251,9 +1251,11 @@
 	const svn_delta_editor_t *editor;
 	void *edit_baton;
 	RemoteAccessObject *ra = (RemoteAccessObject *)self;
-	apr_hash_t *hash_lock_tokens, *hash_revprops;
+	apr_hash_t *hash_lock_tokens;
 #if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 5
 	PyObject *py_log_msg;
+#else
+	apr_hash_t *hash_revprops;
 #endif
 	svn_error_t *err;
 

=== modified file 'remote.py'
--- a/remote.py	2008-08-24 15:53:05 +0000
+++ b/remote.py	2008-08-29 10:10:59 +0000
@@ -85,9 +85,12 @@
             transport = transport.clone_root()
         return SvnRepository(self, transport, self.branch_path)
 
-    def cloning_metadir(self):
+    def cloning_metadir(self, stacked=False):
         """Produce a metadir suitable for cloning with."""
-        return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
+        if stacked:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("1.6-rich-root")
+        else:
+            return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
     def open_workingtree(self, _unsupported=False,
             recommend_upgrade=True):

=== modified file 'versionedfiles.py'
--- a/versionedfiles.py	2008-08-23 17:55:26 +0000
+++ b/versionedfiles.py	2008-08-28 15:59:55 +0000
@@ -49,6 +49,7 @@
                     try:
                         stream = StringIO()
                         self.repository.transport.get_file(urlutils.join(branch, k), stream, revnum)
+                        stream.seek(0)
                         lines = stream.readlines()
                     except SubversionException, (_, num):
                         if num == ERR_FS_NOT_FILE: