[MERGE] log --[line|short] FILE fix

[Ian Clatworthy]

This fixes log --line FILE and log --short FILE so that
the mainline revisions merging a change to FILE are now
included. (Previously, a mainline revision would only be
included if it directly changed the file.)

Thanks to John Arbash Meinel for his assistance in
debugging this.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: log-file-line-short-fix.patch
Type: text/x-diff
Size: 12332 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090115/cb894a76/attachment-0001.bin