Re: UPDATE: bzr 1.8

2009-01-06 Thread Toni Mueller 

Hi,

On Fri, 02.01.2009 at 22:31:42 +0100, Toni Mueller  
wrote:
> On Sat, 25.10.2008 at 15:06:00 +0200, Bernd Ahlers  wrote:
> > Brad [Sat, Oct 25, 2008 at 05:50:50AM -0400] wrote:
> > >Here is an update to bzr 1.8.
> > Regress tests crash on amd64 and i386. Did you run them?
> 
> I've just reproduced the problem with bzr 1.10, and am going to ship
> the test results to upstream.

please see https://bugs.edge.launchpad.net/bzr/+bug/314247

-- 
Kind regards,
--Toni++

Re: UPDATE: bzr 1.8

2009-01-02 Thread Toni Mueller 

Hi,

On Sat, 25.10.2008 at 15:06:00 +0200, Bernd Ahlers  wrote:
> Brad [Sat, Oct 25, 2008 at 05:50:50AM -0400] wrote:
> >Here is an update to bzr 1.8.
> Regress tests crash on amd64 and i386. Did you run them?

I've just reproduced the problem with bzr 1.10, and am going to ship
the test results to upstream.


-- 
Kind regards,
--Toni++

Re: UPDATE: bzr 1.8

2008-10-25 Thread Bernd Ahlers 
Brad [Sat, Oct 25, 2008 at 05:50:50AM -0400] wrote:
>Here is an update to bzr 1.8.
>
>Please test.
>
Regress tests crash on amd64 and i386. Did you run them?

Bernd

UPDATE: bzr 1.8

2008-10-25 Thread Brad 
Here is an update to bzr 1.8.

Please test.


Index: Makefile
===
RCS file: /cvs/ports/devel/bzr/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile21 Apr 2008 19:00:56 -  1.4
+++ Makefile25 Oct 2008 08:58:46 -
@@ -4,19 +4,19 @@ SHARED_ONLY=  Yes
 
 COMMENT=   distributed version control system by Canonical
 
-MODPY_EGG_VERSION=1.3
+MODPY_EGG_VERSION=1.8
 DISTNAME=  bzr-${MODPY_EGG_VERSION}
 CATEGORIES=devel
 
 HOMEPAGE=  http://bazaar-vcs.org/
 
-# GPL 
+# GPLv2+ 
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=  ${HOMEPAGE}releases/src/
+MASTER_SITES=  https://launchpad.net/bzr/1.8/${MODPY_EGG_VERSION}/+download/
 
 MODULES=   lang/python
 
Index: distinfo
===
RCS file: /cvs/ports/devel/bzr/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Apr 2008 19:00:56 -  1.3
+++ distinfo25 Oct 2008 08:59:54 -
@@ -1,5 +1,5 @@
-MD5 (bzr-1.3.tar.gz) = GvIzxvoKaIUbxhVbL1Y8MA==
-RMD160 (bzr-1.3.tar.gz) = 5758kORIvyLsWMgRUFxt0VGafks=
-SHA1 (bzr-1.3.tar.gz) = 5qkqsKv+VL/A+kkvEdxlu3Way0c=
-SHA256 (bzr-1.3.tar.gz) = Ra4dILigyx1FBEPZaftRdbkLxebhg6ZUhJNs+L4Ea3w=
-SIZE (bzr-1.3.tar.gz) = 3477457
+MD5 (bzr-1.8.tar.gz) = ltoVlUBJ36crkn2WE0pV1A==
+RMD160 (bzr-1.8.tar.gz) = hxlLu+XNWF5I/Nv2tj4gK8v5W0o=
+SHA1 (bzr-1.8.tar.gz) = BjXeiZqOdkgH1gN7KWuGlCos5P8=
+SHA256 (bzr-1.8.tar.gz) = t5bdgcoiOB/E9Z17ETL5b1ROKQXjzkaGGqplGVEXZ8k=
+SIZE (bzr-1.8.tar.gz) = 3818860
Index: patches/patch-bzrlib_diff_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_diff_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bzrlib_diff_py
--- patches/patch-bzrlib_diff_py21 Apr 2008 19:00:56 -  1.2
+++ patches/patch-bzrlib_diff_py22 Sep 2008 15:54:22 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_diff_py,v 1.2 2008/04/21 19:00:56 okan Exp $
 bzrlib/diff.py.origTue Jan 15 02:08:01 2008
-+++ bzrlib/diff.py Sun Feb  3 11:33:31 2008
-@@ -173,7 +173,7 @@ def external_diff(old_filename, oldlines, new_filename
+--- bzrlib/diff.py.origFri Sep  5 16:12:49 2008
 bzrlib/diff.py Mon Sep 22 11:54:15 2008
+@@ -174,7 +174,7 @@ def external_diff(old_filename, oldlines, new_filename
  
  if not diff_opts:
  diff_opts = []
Index: patches/patch-bzrlib_tests_test_diff_py
===
RCS file: /cvs/ports/devel/bzr/patches/patch-bzrlib_tests_test_diff_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bzrlib_tests_test_diff_py
--- patches/patch-bzrlib_tests_test_diff_py 21 Apr 2008 19:00:56 -  
1.1
+++ patches/patch-bzrlib_tests_test_diff_py 22 Sep 2008 15:54:26 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.1 2008/04/21 19:00:56 okan Exp $
 bzrlib/tests/test_diff.py.orig Thu Mar 20 03:12:10 2008
-+++ bzrlib/tests/test_diff.py  Wed Apr  2 22:52:46 2008
-@@ -270,7 +270,7 @@ class TestDiffFiles(TestCaseInTempDir):
+--- bzrlib/tests/test_diff.py.orig Fri Sep  5 16:12:55 2008
 bzrlib/tests/test_diff.py  Mon Sep 22 11:54:15 2008
+@@ -260,7 +260,7 @@ class TestDiffFiles(TestCaseInTempDir):
  # Make sure external_diff doesn't fail in the current LANG
  lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-bzrlib_tests_test_diff_p
  open('old', 'wb').write('\x00foobar\n')
  open('new', 'wb').write('foo\x00bar\n')
  pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-@@ -1257,7 +1257,7 @@ class TestDiffFromTool(TestCaseWithTransport):
+@@ -1280,7 +1280,7 @@ class TestDiffFromTool(TestCaseWithTransport):
  
  def test_execute(self):
  output = StringIO()
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/bzr/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   21 Apr 2008 19:00:56 -  1.2
+++ pkg/PLIST   25 Oct 2008 09:38:26 -
@@ -4,6 +4,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bzrlib/
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_btree_serializer_c.so
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_btree_serializer_py.py
+lib/python${MODPY_VERSION}/site-packages/bzrlib/_btree_serializer_py.pyc
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_c.so
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.py
 lib/python${MODPY_VERSION}/site-packages/bzrlib/_dirstate_helpers_py.pyc
@@ -13,6 +16,9 @@ lib/python${MODPY_VERSION}/s