Bazaar

Merge lp:~jelmer/bzr/2.1-fix-foreignrev into lp:bzr/2.1

  1. 2.1-fix-foreignrev
  2. Merge into 2.1
Proposed by Jelmer Vernooij on 2010-02-10
Status: Merged
Approved by: Vincent Ladeuil on 2010-02-10
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jelmer/bzr/2.1-fix-foreignrev
Merge into: lp:bzr/2.1
Diff against target: 12 lines (+1/-1)
1 file modified
bzrlib/log.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/bzr/2.1-fix-foreignrev
Reviewer Review Type Date Requested Status
Vincent Ladeuil 2010-02-10 Approve on 2010-02-10
Review via email: mp+19008@code.launchpad.net
To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

Cherrypick of the foreign branch fix to 2.1.

Vincent Ladeuil (vila) wrote :

Hmm, getting a config for a repo is harder than it should be
and will require to much changes to safely land in 2.1...
So test post-poned :-/

I'll ask jam (2.1 RM) about landing it asap.

review: Approve
Vincent Ladeuil (vila) wrote :

meh, forget the remark about the tests I mix two submissions, my vote is still approve though.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/log.py'
2--- bzrlib/log.py 2010-01-05 02:13:02 +0000
3+++ bzrlib/log.py 2010-02-10 13:54:21 +0000
4@@ -1405,7 +1405,7 @@
5 """
6 # Revision comes directly from a foreign repository
7 if isinstance(rev, foreign.ForeignRevision):
8- return rev.mapping.vcs.show_foreign_revid(rev.foreign_revid)
9+ return self._format_properties(rev.mapping.vcs.show_foreign_revid(rev.foreign_revid))
10
11 # Imported foreign revision revision ids always contain :
12 if not ":" in rev.revision_id:

Subscribers

People subscribed via source and target branches