Merge lp:~bialix/bzr-windows-installers/dulwich into lp:bzr-windows-installers

Proposed by Alexander Belchenko
Status: Merged
Approved by: Martin Packman
Approved revision: 207
Merged at revision: 207
Proposed branch: lp:~bialix/bzr-windows-installers/dulwich
Merge into: lp:bzr-windows-installers
Diff against target: 30 lines (+3/-3)
1 file modified
bazaar_releases.py (+3/-3)
To merge this branch: bzr merge lp:~bialix/bzr-windows-installers/dulwich
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Bazaar Developers Pending
Review via email: mp+97014@code.launchpad.net

Description of the change

Update dulwich version for bzr 2.5. That fixes bug 952834.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

I still don't see any tags past dulwich-0.8.0 on lp:dulwich so we may need to keep using the corresponding revno:1015 as before.

review: Needs Information
Revision history for this message
Alexander Belchenko (bialix) wrote :

Martin Packman пишет:
> Review: Needs Information
>
> I still don't see any tags past dulwich-0.8.0 on lp:dulwich so we may need to keep using the corresponding revno:1015 as before.

Interesting.

C:\Temp>bzr branch lp:dulwich
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Branched 1028 revisions.

C:\Temp\dulwich>bzr tags | grep dulwich-0.8.3

C:\Temp\dulwich>bzr tags
dulwich-0.1.0 136
dulwich-0.1.1 179
dulwich-0.2.0 252
dulwich-0.2.1 259
dulwich-0.3.0 335
dulwich-0.3.1 352
dulwich-0.3.2 389
dulwich-0.3.3 401
dulwich-0.4.0 417
dulwich-0.4.1 433
dulwich-0.5.0 469
dulwich-0.6.0 601
dulwich-0.6.1 634
dulwich-0.6.2 689
dulwich-0.7.0 797
dulwich-0.7.1 820
dulwich-0.8.0 928
rc-fix-pack-protocol-v2 489.1.1
rc-test-temp-v1 ?
rc-walker-ack-v4 ?
rc-walker-ack-v5 ?
ticket-12-v4 ?

C:\Temp\dulwich>bzr info
Standalone tree (format: unnamed)
Location:
   branch root: .

Related branches:
   parent branch: bzr+ssh://bazaar.launchpad.net/+branch/dulwich/

BUT!!!

C:\Temp\dulwich>bzr info
Standalone tree (format: unnamed)
Location:
   branch root: .

Related branches:
   parent branch: bzr+ssh://bazaar.launchpad.net/+branch/dulwich/

C:\work\Bazaar\zzz\dulwich>bzr info
Standalone tree (format: unnamed)
Location:
   branch root: .

Related branches:
   parent branch: http://people.samba.org/bzr/jelmer/dulwich/trunk/

C:\work\Bazaar\zzz\dulwich>bzr tags | grep dulwich-0.8.3
dulwich-0.8.3 1015

C:\work\Bazaar\zzz\dulwich>bzr tags
dulwich-0.1.0 136
dulwich-0.1.1 179
dulwich-0.2.0 252
dulwich-0.2.1 259
dulwich-0.3.0 335
dulwich-0.3.1 352
dulwich-0.3.2 389
dulwich-0.3.3 401
dulwich-0.4.0 417
dulwich-0.4.1 433
dulwich-0.5.0 469
dulwich-0.6.0 601
dulwich-0.6.1 634
dulwich-0.6.2 689
dulwich-0.7.0 797
dulwich-0.7.1 820
dulwich-0.8.0 928
dulwich-0.8.1 961
dulwich-0.8.2 988
dulwich-0.8.3 1015
rc-common-obj-v1 ?
rc-common-obj-v2 ?
rc-common-obj-v3 ?
rc-common-obj-v4 ?
rc-fix-pack-protocol-v1 ?
rc-fix-pack-protocol-v2 489.1.1
rc-fix-pack-protocol-v3 489.1.1
rc-nose-opt-v1 ?
rc-test-temp-v1 ?
rc-walker-ack-v1 ?
rc-walker-ack-v2 ?
rc-walker-ack-v3 ?
rc-walker-ack-v4 ?
rc-walker-ack-v5 ?
ticket-12-v1 ?
ticket-12-v2 ?
ticket-12-v3 ?
ticket-12-v4 ?

How is it possible?

--
All the dude wanted was his rug back

Revision history for this message
Martin Packman (gz) wrote :

It's an issue with bzr-git pushing tags, I just kicked Jelmer and he magicked it fixed, so will merge this now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bazaar_releases.py'
2--- bazaar_releases.py 2012-03-07 18:33:43 +0000
3+++ bazaar_releases.py 2012-03-12 13:31:18 +0000
4@@ -299,7 +299,7 @@
5 # The projects to bundle
6 projects = [
7 Project('bzr', 'lp:bzr/2.5', revision='tag:bzr-2.5.0'),
8- dulwich.copy_write(revision='revno:988'), # missing tag:0.8.2
9+ dulwich.copy_write(revision='tag:dulwich-0.8.3'),
10 subvertpy.copy_write(revision='tag:subvertpy-0.8.10'),
11 python_fastimport.copy_write(revision='tag:fastimport-0.9.0'),
12 tortoisebzr.copy_write(revision='tag:release-0.6.6'),
13@@ -352,7 +352,7 @@
14 # The projects to bundle
15 projects = [
16 Project('bzr'),
17- dulwich.copy_write(revision='tag:dulwich-0.8.0'),
18+ dulwich.copy_write(revision='tag:dulwich-0.8.3'),
19 python_fastimport,
20 subvertpy,
21 tortoisebzr,
22@@ -368,7 +368,7 @@
23 colo,
24 explorer,
25 bzr_fastimport,
26- git.copy_write(revision='tag:bzr-git-0.6.2'),
27+ git.copy_write(revision='tag:bzr-git-0.6.7'),
28 loom,
29 pipeline,
30 rewrite,

Subscribers

People subscribed via source and target branches