← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jelmer/launchpad/newer-bzr-git-20111212 into lp:launchpad

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/newer-bzr-git-20111212 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/newer-bzr-git-20111212/+merge/85780

Update bzr-git and dulwich to newer upstream versions, and discard the launchpad-specific changes in bzr-git. Some of these local changes were the cause for the qa-badness of lp:~jelmer/launchpad/load-foreign-plugins. See bug 509016 for details.
-- 
https://code.launchpad.net/~jelmer/launchpad/newer-bzr-git-20111212/+merge/85780
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/newer-bzr-git-20111212 into lp:launchpad.
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-11-28 02:03:17 +0000
+++ utilities/sourcedeps.cache	2011-12-15 01:54:37 +0000
@@ -4,8 +4,8 @@
         "launchpad@xxxxxxxxxxxxxxxxx-20111114140506-6bmt9isw6lcud7yt"
     ], 
     "bzr-git": [
-        271, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111104111914-aab1gxfh6d4kk582"
+        274, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20111215014415-hjc2z537k31pny0v"
     ], 
     "bzr-hg": [
         292, 
@@ -28,8 +28,8 @@
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
     "dulwich": [
-        433, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20111102161814-dm6dx8d808rrg6a1"
+        435, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20111215014116-j7lw563fh7kuqp0n"
     ], 
     "loggerhead": [
         461, 

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-11-28 02:03:17 +0000
+++ utilities/sourcedeps.conf	2011-12-15 01:54:37 +0000
@@ -1,10 +1,10 @@
 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=70
-bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=271
+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=274
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=292
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=51
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2720
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
-dulwich lp:~launchpad-pqm/dulwich/devel;revno=433
+dulwich lp:~launchpad-pqm/dulwich/devel;revno=435
 difftacular lp:difftacular;revno=6
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=461
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23