Rev 3403: (mbp) merge 1.3.1 news into trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri May 2 12:53:16 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3403
revision-id:pqm at pqm.ubuntu.com-20080502115300-98iunzq9437108n5
parent: pqm at pqm.ubuntu.com-20080502094759-pc5dduhtm7wo40cg
parent: mbp at sourcefrog.net-20080502054354-t1ah9qqd1a156v73
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 12:53:00 +0100
message:
(mbp) merge 1.3.1 news into trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3400.2.1
revision-id:mbp at sourcefrog.net-20080502054354-t1ah9qqd1a156v73
parent: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: pqm at pqm.ubuntu.com-20080410124049-lr93doxjjygno0ls
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.3
timestamp: Fri 2008-05-02 15:43:54 +1000
message:
merge 1.3.1 back into trunk
(news update only, the fix for #208418 was already merged)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.6.3.2.2
revision-id:pqm at pqm.ubuntu.com-20080410124049-lr93doxjjygno0ls
parent: pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
parent: mbp at sourcefrog.net-20080410072413-bnjumo1fcn57ezvh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Thu 2008-04-10 13:40:49 +0100
message:
Prepare 1.3.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.6.3.2.1.1.1
revision-id:mbp at sourcefrog.net-20080410072413-bnjumo1fcn57ezvh
parent: pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-04-10 17:24:13 +1000
message:
Prepare 1.3.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.6.3.2.1
revision-id:pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
parent: pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
parent: mbp at sourcefrog.net-20080404060940-pkcm2gpdxboot3em
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Fri 2008-04-04 08:45:25 +0100
message:
Fix 208418 and prepare 1.3rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3287.6.3.3.3
revision-id:mbp at sourcefrog.net-20080404060940-pkcm2gpdxboot3em
parent: mbp at sourcefrog.net-20080404060718-duljxhe92djgiz0h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:09:40 +1100
message:
Prepare 1.3.1rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.6.3.3.2
revision-id:mbp at sourcefrog.net-20080404060718-duljxhe92djgiz0h
parent: mbp at sourcefrog.net-20080404060424-6r40a2iu4igsm7zb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:07:18 +1100
message:
Add NEWS about #208418
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.6.3.3.1
revision-id:mbp at sourcefrog.net-20080404060424-6r40a2iu4igsm7zb
parent: pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
parent: mbp at sourcefrog.net-20080404055815-hnjqcoe0z1psu8aj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:04:24 +1100
message:
Merge fix without tests for #208418
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3287.6.3.1.1.1.1
revision-id:mbp at sourcefrog.net-20080404055815-hnjqcoe0z1psu8aj
parent: mbp at sourcefrog.net-20080404043344-ewtd0ck2mm0l7sx9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 208418-knit-parsing
timestamp: Fri 2008-04-04 16:58:15 +1100
message:
_StreamIndex.get_options: avoid mutating a list from the basis knit
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
=== modified file 'NEWS'
--- a/NEWS 2008-05-02 05:10:09 +0000
+++ b/NEWS 2008-05-02 11:53:00 +0000
@@ -424,6 +424,23 @@
``Graph.get_parent_map`` returns a dict of key:parents. (Robert Collins)
+bzr 1.3.1 2008-04-09
+--------------------
+
+ No changes from 1.3.1rc1.
+
+
+bzr 1.3rc1 2008-04-04
+---------------------
+
+ BUG FIXES:
+
+ * Fix a bug causing a ValueError crash in ``parse_line_delta_iter`` when
+ fetching revisions from a knit to pack repository or vice versa using
+ bzr:// (including over http or ssh).
+ (#208418, Andrew Bennetts, Martin Pool, Robert Collins)
+
+
bzr 1.3 2008-03-20
------------------
More information about the bazaar-commits
mailing list