[packages/bzr-fastimport] disable graphing, causes two-way sync to fail

glen glen at pld-linux.org
Sun Jan 20 13:12:30 CET 2013


commit 34adf2128eeb3a0fe0406f6d8f8a72fa77747ccf
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jan 20 14:10:24 2013 +0200

    disable graphing, causes two-way sync to fail
    
    LP:bzr#541626, github:git-bzr-ng#38

 bug-541626.patch    | 19 +++++++++++++++++++
 bzr-fastimport.spec |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/bzr-fastimport.spec b/bzr-fastimport.spec
index 1fcdb65..92a4583 100644
--- a/bzr-fastimport.spec
+++ b/bzr-fastimport.spec
@@ -1,7 +1,7 @@
 Summary:	Bzr plugin for fast loading of data from other VCS tools
 Name:		bzr-fastimport
 Version:	0.13.0
-Release:	1
+Release:	2
 Group:		Development/Languages
 # Some modules in the exporters/ subdir are MIT-licensed.
 License:	GPL v2+ and MIT
@@ -9,6 +9,7 @@ URL:		https://launchpad.net/bzr-fastimport
 Source0:	http://launchpad.net/bzr-fastimport/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 # Source0-md5:	e47115774d44ae0c3b027ae0374aa52e
 Patch0:		bug-1101776.patch
+Patch1:		bug-541626.patch
 BuildRequires:	bzr
 BuildRequires:	python-distribute
 Requires:	bzr
@@ -29,6 +30,7 @@ custom migration solution.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 %{__python} setup.py build
diff --git a/bug-541626.patch b/bug-541626.patch
new file mode 100644
index 0000000..77e43d2
--- /dev/null
+++ b/bug-541626.patch
@@ -0,0 +1,19 @@
+disable graphing
+https://bugs.launchpad.net/bzr/+bug/541626
+
+minimal testcase from
+https://github.com/termie/git-bzr-ng/issues/38
+
+=== modified file 'revision_store.py'
+--- revision_store.py	2012-01-10 08:48:02 +0000
++++ revision_store.py	2012-11-03 22:06:31 +0000
+@@ -170,7 +170,7 @@
+         """
+         self.repo = repo
+         self._graph = None
+-        self._use_known_graph = True
++        self._use_known_graph = False
+         self._supports_chks = getattr(repo._format, 'supports_chks', False)
+ 
+     def expects_rich_root(self):
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bzr-fastimport.git/commitdiff/34adf2128eeb3a0fe0406f6d8f8a72fa77747ccf



More information about the pld-cvs-commit mailing list