Bazaar

bzr log <file> displays irrelevant log records

Bug #51980 reported by Francis J. Lacoste on 2006-07-05

Affects		Status	Importance	Assigned to	Milestone
	Bazaar	Fix Released	Medium	John A Meinel	Bazaar 0.16

Bug Description

When another branch was merged in the tree,
bzr log <file> will display the merged log records for any <file> even if the merge didn't involved the file. Ideally, only the log records relevant for <file> should be displayed from the merged log info.

Another problem is that bzr log <non-existent-file> displays the whole log history instead of simply saying 'File <non-existent-file> doesn't have any revision history'.

Consider raising the priority of this bug, since it removes the usefulness of bzr log when working in large projects which uses merging a lot (Launchpad for example).

Tags:

Revision history for this message

Francis J. Lacoste (flacoste) wrote on 2006-07-05: Transcript of a simple bzr session displaying the bug

Transcript of a simple bzr session displaying the bug Edit (6.1 KiB, text/plain)

This bzr session shows that once a merge was done, bzr log <FILE> will show the log entry of the merge even if the merge didn't implicate the requested file.

Wouter van Heyst (larstiq) on 2006-07-05

Changed in bzr:
assignee:	nobody → larstiq

Revision history for this message

Francis J. Lacoste (flacoste) wrote on 2006-07-05:

This bug was added first as comments on bug 4663 (https://launchpad.net/products/bzr/+bug/4663). Disregard these comments in that context.

Revision history for this message

John A Meinel (jameinel) wrote on 2006-07-23:

Well, in those circumstances, the merge should be shown, because it does change the file contents.

But I would agree that we shouldn't show all of the revisions that were merged by that change.

I don't believe Larstiq's current log updates modify this behavior, but it might.

Changed in bzr:
importance:	Untriaged → Medium
status:	Unconfirmed → Confirmed

Revision history for this message

Martin Pool (mbp) wrote on 2006-08-07:

Let's try to fix this in 0.10; it's a significant UI bug.

Revision history for this message

John A Meinel (jameinel) wrote on 2006-08-28:

bumped to 0.11, and Wouter said he was to busy this month.

Changed in bzr:
assignee:	larstiq → nobody

Revision history for this message

John A Meinel (jameinel) wrote on 2006-09-02:

related to bug 50793

Cheuksan Edward Wang (wang02139) on 2006-11-01

Changed in bzr:
assignee:	nobody → wang02139

Cheuksan Edward Wang (wang02139) on 2006-12-11

Changed in bzr:
assignee:	wang02139 → nobody

Kent Gibson (warthog618) on 2007-03-15

Changed in bzr:
assignee:	nobody → warthog618
status:	Confirmed → In Progress

Revision history for this message

John A Meinel (jameinel) wrote on 2007-03-21:

Process deltas for merged revisions Edit (7.8 KiB, text/plain)

I guess I didn't realize that "bzr log <file>" displays all merges. But yes, this is indeed the same as bug 94499

The patch I'm uploading has a fix for this, which makes 'bzr log file' only show revisions which actually modified the file.

It also has an update to 'bzr log --verbose' so it shows the changes for merged revisions.

And it reduces the memory consumption for large 'bzr log' especially for 'bzr log --verbose' or 'bzr log filename'.

Revision history for this message

Robert Collins (lifeless) wrote on 2007-03-22: Re: [Bug 51980] Re: bzr log <file> displays irrelevant log records

On Wed, 2007-03-21 at 20:57 +0000, John A Meinel wrote:
> I guess I didn't realize that "bzr log <file>" displays all merges. But
> yes, this is indeed the same as bug 94499
>
> The patch I'm uploading has a fix for this, which makes 'bzr log file'
> only show revisions which actually modified the file.
>
> It also has an update to 'bzr log --verbose' so it shows the changes for
> merged revisions.
>
> And it reduces the memory consumption for large 'bzr log' especially for
> 'bzr log --verbose' or 'bzr log filename'.

What definition of modified? (Does reparenting, exe change, name change
count?)

-Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.