← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jelmer/launchpad/bzr-svn-r3819 into lp:launchpad

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/bzr-svn-r3819 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #685251 in Launchpad itself: "bzr-svn aborts instead of waiting if its sqlite DB is locked"
  https://bugs.launchpad.net/launchpad/+bug/685251
  Bug #824933 in Launchpad itself: "on branch, rebase, ... AttributeError: 'CachingBzrMetaRevision' object has no attribute 'changes_outside_root'"
  https://bugs.launchpad.net/launchpad/+bug/824933

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/bzr-svn-r3819/+merge/72189

Update bzr-svn to a new upstream snapshot.

This snapshot addresses the following issues in Launchpad imports:

 * Properly indicate when remote subversion repositories have broken logs, rather than erroring out and throwing tracebacks in confusing places
 * Handles SQLite databases that are locked more gracefully (bug 685251)
 * Fixes regression of repositories with old-style bzr-svn metadata (bug 824933)
-- 
https://code.launchpad.net/~jelmer/launchpad/bzr-svn-r3819/+merge/72189
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/bzr-svn-r3819 into lp:launchpad.
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-08-19 03:58:35 +0000
+++ utilities/sourcedeps.cache	2011-08-19 14:10:27 +0000
@@ -1,4 +1,8 @@
 {
+    "bzr-builder": [
+        68, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20101123183213-777lz46xgagn1deg"
+    ], 
     "testresources": [
         16, 
         "robertc@xxxxxxxxxxxxxxxxx-20050911111209-ee5da49011cf936a"
@@ -27,18 +31,14 @@
         24, 
         "launchpad@xxxxxxxxxxxxxxxxx-20100601182722-wo7h2fh0fvyw3aaq"
     ], 
+    "lpreview": [
+        23, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20090720061538-euyh68ifavhy0pi8"
+    ], 
     "bzr-git": [
         259, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110601140035-gl5merbechngjw5s"
     ], 
-    "loggerhead": [
-        452, 
-        "andrew.bennetts@xxxxxxxxxxxxx-20110628173100-owrifrnckvoi60af"
-    ], 
-    "bzr-builder": [
-        68, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20101123183213-777lz46xgagn1deg"
-    ], 
     "bzr-loom": [
         49, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110601122412-54vo3k8yae9i2zve"
@@ -47,17 +47,17 @@
         4, 
         "sinzui-20090526164636-1swugzupwvjgomo4"
     ], 
-    "lpreview": [
-        23, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20090720061538-euyh68ifavhy0pi8"
+    "loggerhead": [
+        452, 
+        "andrew.bennetts@xxxxxxxxxxxxx-20110628173100-owrifrnckvoi60af"
     ], 
     "difftacular": [
         6, 
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
     "bzr-svn": [
-        2715, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110810144016-m5f5pbnrpkbz04v3"
+        2717, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110819140025-1a6tgsdwtjx3plii"
     ], 
     "bzr-hg": [
         290, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-08-19 03:58:35 +0000
+++ utilities/sourcedeps.conf	2011-08-19 14:10:27 +0000
@@ -2,7 +2,7 @@
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=290
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=49
-bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2715
+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=426
 difftacular lp:difftacular;revno=6