Rev 4642: Merge trunk. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4642 [merge]
revision-id: robertc at robertcollins.net-20090818051852-cp8udof6ta6agsuv
parent: robertc at robertcollins.net-20090817231944-zs477fmz9uemcon5
parent: pqm at pqm.ubuntu.com-20090818034251-w2biu3woo8y7bcf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Tue 2009-08-18 15:18:52 +1000
message:
  Merge trunk.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
=== modified file 'NEWS'
--- a/NEWS	2009-08-17 23:19:44 +0000
+++ b/NEWS	2009-08-18 05:18:52 +0000
@@ -9,6 +9,16 @@
 In Development
 ##############
 
+Improvements
+************
+
+* A better description of the platform is shown in crash tracebacks, ``bzr
+  --version`` and ``bzr selftest``.
+  (Martin Pool, #409137)
+
+bzr 1.18
+########
+
 Compatibility Breaks
 ********************
 

=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2009-08-17 03:47:03 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2009-08-18 05:18:52 +0000
@@ -817,7 +817,7 @@
         # iteration interface offered at all for repositories. We could make
         # _iter_inventory_xmls be part of the contract, even if kept private.
         inv_to_str = self._serializer.write_inventory_to_string
-        for inv in self.iter_inventories(revision_ids, ordering):
+        for inv in self.iter_inventories(revision_ids, ordering=ordering):
             yield inv_to_str(inv), inv.revision_id
 
     def _find_present_inventory_keys(self, revision_keys):