← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jelmer/launchpad/fix-hg-tags into lp:launchpad

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/fix-hg-tags into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #793812 in Launchpad itself: "doesn't lock target repository when reading tags during fetch"
  https://bugs.launchpad.net/launchpad/+bug/793812

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/fix-hg-tags/+merge/64022

Update bzr-hg to a slightly newer upstream version.

This fixes a regression we noticed while QA'ing the latest Launchpad deployment.
The bug in question broke any hg imports that have tags.
-- 
https://code.launchpad.net/~jelmer/launchpad/fix-hg-tags/+merge/64022
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/fix-hg-tags into lp:launchpad.
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-06-01 18:58:15 +0000
+++ utilities/sourcedeps.cache	2011-06-09 14:36: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": [
-        445, 
-        "john@xxxxxxxxxxxxxxxxx-20110325141442-536j4be3x0c464zy"
-    ], 
-    "bzr-builder": [
-        68, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20101123183213-777lz46xgagn1deg"
-    ], 
     "bzr-loom": [
         49, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110601122412-54vo3k8yae9i2zve"
@@ -47,9 +47,9 @@
         4, 
         "sinzui-20090526164636-1swugzupwvjgomo4"
     ], 
-    "lpreview": [
-        23, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20090720061538-euyh68ifavhy0pi8"
+    "loggerhead": [
+        445, 
+        "john@xxxxxxxxxxxxxxxxx-20110325141442-536j4be3x0c464zy"
     ], 
     "difftacular": [
         6, 
@@ -60,8 +60,8 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20110601185515-xaik1gqvhtr5jiph"
     ], 
     "bzr-hg": [
-        285, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110601185713-cy6wd1u0iim2m9am"
+        286, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110608121012-ukbfdj6izm8n72tp"
     ], 
     "dulwich": [
         426, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-06-01 18:58:15 +0000
+++ utilities/sourcedeps.conf	2011-06-09 14:36:27 +0000
@@ -1,6 +1,6 @@
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
-bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=285
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=286
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=49
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2712
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432