Merge lp:~jfb-tempo-consulting/qbrz/1939011 into lp:qbrz

Proposed by jftempo
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1642
Merged at revision: 1643
Proposed branch: lp:~jfb-tempo-consulting/qbrz/1939011
Merge into: lp:qbrz
Diff against target: 12 lines (+1/-1)
1 file modified
lib/ (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/qbrz/1939011
Reviewer Review Type Date Requested Status
Robert Ladyman Approve
Review via email:

Commit message

To post a comment you must log in.
Revision history for this message
Robert Ladyman (saccadic-masking) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/'
--- lib/ 2021-01-08 16:50:52 +0000
+++ lib/ 2021-08-05 11:14:20 +0000
@@ -262,7 +262,7 @@
262 file_id = tree.path2id(relpath)262 file_id = tree.path2id(relpath)
263 if file_id is None:263 if file_id is None:
264 raise errors.NotVersionedError(filename)264 raise errors.NotVersionedError(filename)
265 [(path, entry)] = list(tree.iter_entries_by_dir(specific_files=[filename]))265 [(path, entry)] = list(tree.iter_entries_by_dir(specific_files=[relpath]))
266 if entry.kind != 'file':266 if entry.kind != 'file':
267 raise errors.BzrCommandError('brz qannotate only works for files (got %r)' % entry.kind)267 raise errors.BzrCommandError('brz qannotate only works for files (got %r)' % entry.kind)
268 #repo = branch.repository268 #repo = branch.repository


People subscribed via source and target branches

to all changes: