Merge lp:~jelmer/bzr-git/fix-dulwich-compat into lp:bzr-git

Proposed by Jelmer Vernooij on 2014-01-18
Status: Merged
Merged at revision: 1629
Proposed branch: lp:~jelmer/bzr-git/fix-dulwich-compat
Merge into: lp:bzr-git
Diff against target: 11 lines (+1/-1)
1 file modified
branch.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr-git/fix-dulwich-compat
Reviewer Review Type Date Requested Status
Richard Wilbur 2014-01-18 Approve on 2014-01-19
Review via email: mp+202196@code.launchpad.net

Description of the change

Trivial fix for bzr-git from pitti when used with newer versions of Dulwich.

To post a comment you must log in.
Richard Wilbur (richard-wilbur) wrote :

Good fix! Thanks for cleaning up the test failures, Martin.
+1

review: Approve
Jelmer Vernooij (jelmer) wrote :

On Sun, Jan 19, 2014 at 04:28:37PM -0000, Richard Wilbur wrote:
> Review: Approve
>
> Good fix! Thanks for cleaning up the test failures, Martin.
> +1

Can you please merge this? I'm no longer in the right groups, I think.

Richard Wilbur (richard-wilbur) wrote :

@Jelmer: Happy to oblige. Thanks for your work to keep bzr-git alive.

Richard Wilbur (richard-wilbur) wrote :

@Jelmer: What should we update the bug status to in Launchpad LP:
#1270075 -- "Fix Committed" or "Fix Released"? Seems we could safely
claim the fix has been committed--it's on trunk after all. At what
point do we change to "Fix Released", when we make a bzr-git release
containing the fix?

Jelmer Vernooij (jelmer) wrote :

On Mon, Jan 20, 2014 at 03:15:32PM -0000, Richard Wilbur wrote:
> @Jelmer: What should we update the bug status to in Launchpad LP:
> #1270075 -- "Fix Committed" or "Fix Released"? Seems we could safely
> claim the fix has been committed--it's on trunk after all. At what
> point do we change to "Fix Released", when we make a bzr-git release
> containing the fix?
yeah, that's what I've always done in the past.

That policy is by no means set in stone though. Whoever is actually
doing the work should decide what works best for them.

Cheers,

Jelmer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'branch.py'
2--- branch.py 2012-07-02 19:02:08 +0000
3+++ branch.py 2014-01-18 17:13:09 +0000
4@@ -555,7 +555,7 @@
5
6 def _get_head(self):
7 try:
8- return self.repository._git.ref(self.ref or "HEAD")
9+ return self.repository._git.refs[self.ref or "HEAD"]
10 except KeyError:
11 return None
12

Subscribers

People subscribed via source and target branches

to all changes: