Rev 4666: Merge 2.0 tip, including bugfix 422849, generate correct deltas when upgrading locally. in http://people.canonical.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4666 [merge]
revision-id: robertc at robertcollins.net-20090902082907-hw21gj3dbg9j9nx2
parent: pqm at pqm.ubuntu.com-20090831002739-vd6487doda1b2k9h
parent: pqm at pqm.ubuntu.com-20090902081813-ty3elsejlo8ux4rx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-09-02 18:29:07 +1000
message:
  Merge 2.0 tip, including bugfix 422849, generate correct deltas when upgrading locally.
removed:
  doc/en/migration/              migration-20090722133816-63ik5s6s5gsnz7zy-7
  doc/en/migration/index.txt     index.txt-20090722133816-63ik5s6s5gsnz7zy-8
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  doc/_templates/index.html      index.html-20090722133849-lus2rzwsmlhpgqhv-1
  doc/contents.txt               contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
=== modified file 'NEWS'
--- a/NEWS	2009-08-30 23:51:10 +0000
+++ b/NEWS	2009-09-02 08:29:07 +0000
@@ -73,6 +73,16 @@
   that has a ghost in the mainline ancestry.
   (John Arbash Meinel, #419241)
 
+* Local data conversion will generate correct deltas. This is a critical
+  bugfix vs 2.0rc1, and all 2.0rc1 users should upgrade to 2.0rc2 before
+  converting repositories. (Robert Collins, #422849)
+
+Documentation
+*************
+
+* The main table of contents now provides links to the new Migration Docs
+  and Plugins Guide. (Ian Clatworthy)
+
 
 bzr 2.0rc1
 ##########

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2009-08-30 23:51:10 +0000
+++ b/bzrlib/repository.py	2009-09-02 08:29:07 +0000
@@ -3844,6 +3844,9 @@
                 possible_trees.append((basis_id, cache[basis_id]))
             basis_id, delta = self._get_delta_for_revision(tree, parent_ids,
                                                            possible_trees)
+            revision = self.source.get_revision(current_revision_id)
+            pending_deltas.append((basis_id, delta,
+                current_revision_id, revision.parent_ids))
             if self._converting_to_rich_root:
                 self._revision_id_to_root_id[current_revision_id] = \
                     tree.get_root_id()
@@ -3878,9 +3881,6 @@
                     if entry.revision == file_revision:
                         texts_possibly_new_in_tree.remove(file_key)
             text_keys.update(texts_possibly_new_in_tree)
-            revision = self.source.get_revision(current_revision_id)
-            pending_deltas.append((basis_id, delta,
-                current_revision_id, revision.parent_ids))
             pending_revisions.append(revision)
             cache[current_revision_id] = tree
             basis_id = current_revision_id

=== modified file 'doc/_templates/index.html'
--- a/doc/_templates/index.html	2009-07-22 14:36:38 +0000
+++ b/doc/_templates/index.html	2009-08-18 00:10:19 +0000
@@ -26,19 +26,17 @@
       <p class="biglink"><a class="biglink" href="{{ pathto("en/upgrade-guide/index") }}">Upgrade Guide</a><br/>
       <span class="linkdescr">moving to Bazaar 2.x</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("en/migration/index") }}">Migration Docs</a><br/>
+      <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/migration/en/">Migration Docs</a><br/>
       <span class="linkdescr">for refugees of other tools</span>
       </p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("developers/index") }}">Developer Docs</a><br/>
-      <span class="linkdescr">polices and tools for giving back</span>
+      <p class="biglink"><a class="biglink" href="http://doc.bazaar-vcs.org/plugins/en/">Plugins Guide</a><br/>
+      <span class="linkdescr">help on popular plugins</span>
       </p>
     </td></tr>
   </table>
 
-  <p>Other languages:
-      <a href="{{ pathto("index.es") }}">Spanish</a>,
-      <a href="{{ pathto("index.ru") }}">Russian</a>
-  </p>
+  <p>Keen to help? See the <a href="{{ pathto("developers/index") }}">Developer Docs</a>
+      for policies and tools on contributing code, tests and documentation.</p>
 
 
   <h2>Related Links</h2>
@@ -59,4 +57,9 @@
     </td></tr>
   </table>
 
+  <hr>
+  <p>Other languages:
+      <a href="{{ pathto("index.es") }}">Spanish</a>,
+      <a href="{{ pathto("index.ru") }}">Russian</a>
+  </p>
 {% endblock %}

=== modified file 'doc/contents.txt'
--- a/doc/contents.txt	2009-07-22 13:41:01 +0000
+++ b/doc/contents.txt	2009-08-18 00:10:19 +0000
@@ -20,7 +20,6 @@
 
    en/release-notes/index
    en/upgrade-guide/index
-   en/migration/index
    developers/index
 
 

=== removed directory 'doc/en/migration'
=== removed file 'doc/en/migration/index.txt'
--- a/doc/en/migration/index.txt	2009-07-22 13:41:01 +0000
+++ b/doc/en/migration/index.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-Bazaar Migration Guide
-======================
-
-This guide is under development. For notes collected so far, see
-http://bazaar-vcs.org/BzrMigration/.
-