Rev 3878: Merge bzr.dev, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Mon Dec 1 18:42:04 GMT 2008
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 3878
revision-id: john at arbash-meinel.com-20081201184008-4vwipjkqxmhay69a
parent: amanic at gmail.com-20081201173744-wlscf6xusxegewjh
parent: pqm at pqm.ubuntu.com-20081201071425-al48chdg4wlkbm31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2008-12-01 12:40:08 -0600
message:
Merge bzr.dev, resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3872.2.2
revision-id: pqm at pqm.ubuntu.com-20081201071425-al48chdg4wlkbm31
parent: pqm at pqm.ubuntu.com-20081129023747-31a9su43tijw8p3r
parent: mbp at sourcefrog.net-20081201061621-vq6tnr7b29phf26m
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-12-01 07:14:25 +0000
message:
(mbp) doc how to package bzr-svn into the PPA
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3870.1.2
revision-id: mbp at sourcefrog.net-20081201061621-vq6tnr7b29phf26m
parent: mbp at sourcefrog.net-20081128052623-dvzz9i8ahmb8cofa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc-ppa
timestamp: Mon 2008-12-01 17:16:21 +1100
message:
Note about merging bzr-svn from jelmer's branch
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3870.1.1
revision-id: mbp at sourcefrog.net-20081128052623-dvzz9i8ahmb8cofa
parent: pqm at pqm.ubuntu.com-20081128031739-mprtvyhcn9zwtkqc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2008-11-28 16:26:23 +1100
message:
Add some notes on ppa packaging of bzr-svn
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3872.2.1
revision-id: pqm at pqm.ubuntu.com-20081129023747-31a9su43tijw8p3r
parent: pqm at pqm.ubuntu.com-20081128071639-usprv2emoq2mgxnw
parent: andrew.bennetts at canonical.com-20081129020121-tazph6xr6jgwy0lp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-11-29 02:37:47 +0000
message:
Call PyErr_NoMemory() before returning NULL in
PatienceSequenceMatcher_new.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
------------------------------------------------------------
revno: 3872.1.2
revision-id: andrew.bennetts at canonical.com-20081129020121-tazph6xr6jgwy0lp
parent: andrew.bennetts at canonical.com-20081129003113-7i4ib0spwj53o1l5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: patiencediff_c-fix
timestamp: Sat 2008-11-29 13:01:21 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3872.1.1
revision-id: andrew.bennetts at canonical.com-20081129003113-7i4ib0spwj53o1l5
parent: pqm at pqm.ubuntu.com-20081128071639-usprv2emoq2mgxnw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: patiencediff_c-fix
timestamp: Sat 2008-11-29 11:31:13 +1100
message:
Call PyErr_NoMemory() before returning NULL in PatienceSequenceMatcher_new.
modified:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-11-30 20:23:58 +0000
+++ b/NEWS 2008-12-01 18:40:08 +0000
@@ -16,6 +16,10 @@
BUG FIXES:
+ * Fix SystemError in ``_patiencediff_c`` module by calling
+ PyErr_NoMemory() before returning NULL in PatienceSequenceMatcher_new.
+ (Andrew Bennetts, #303206)
+
* Give proper error message for diff with non-existent dotted revno.
(Marius Kruger, #301969)
=== modified file 'bzrlib/_patiencediff_c.c'
--- a/bzrlib/_patiencediff_c.c 2008-09-25 22:08:41 +0000
+++ b/bzrlib/_patiencediff_c.c 2008-11-29 00:31:13 +0000
@@ -768,6 +768,7 @@
self->backpointers = (Py_ssize_t *)malloc(sizeof(Py_ssize_t) * self->bsize * 4);
if (self->backpointers == NULL) {
Py_DECREF(self);
+ PyErr_NoMemory();
return NULL;
}
=== modified file 'doc/developers/ppa.txt'
--- a/doc/developers/ppa.txt 2008-10-28 01:13:06 +0000
+++ b/doc/developers/ppa.txt 2008-12-01 06:16:21 +0000
@@ -219,6 +219,34 @@
<https://launchpad.net/~bzr-beta-ppa/+archive/+builds>.
+Packaging bzr-svn
+~~~~~~~~~~~~~~~~~
+
+bzr-svn uses bzr-builddeb in "split" mode, where the packaging branch
+contains both the source and the ``debian/`` directory, and the
+``orig.tar.gz`` is split off when building the packgae.
+
+To build bzr-svn:
+
+#. Get a checkout of ``lp:~bzr/bzr-svn/hardy-ppa/``
+
+#. Merge from ``http://bzr.debian.org/pkg-bazaar/bzr-svn/experimental/``
+
+ This should bring in both upstream and packaging changes for the new
+ release, and it's updated as part of the bzr-svn release process.
+
+#. ``export UPSTREAM_VERSION=bzr-svn-0.4.15`` or similar
+
+#. Run ``dch -v 0.4.15-1~bazaar1-hardy1 -D hardy`` or similar
+
+#. Run ``bzr builddeb --source``
+
+ bzr-builddeb will automatically check out the appropriate tag from the
+ main branch of bzr-svn, build, and package it.
+
+#. ``dput bzr-beta-ppa ../bzr-svn_0.4.15-1~bazaar1~hardy1_source.changes``
+
+
Monitoring the contents of PPAs
-------------------------------
More information about the bazaar-commits
mailing list