bzr status shows pending merges with incorrect indentation
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Invalid
|
Undecided
|
Unassigned |
Bug Description
bzr status shows pending merges with incorrect indentation if there is more than one pending merge. This is confusion because it implies some sort of hierarchical relationship between the merges, where there actually isn't any. For example:
$ bzr status
modified:
src/...
src/...
src/...
src/...
unknown:
src/...
src/...
pending merges:
Wesley J. Landaker 2008-03-07 Added informative message about what ...
Wesley J. Landaker 2008-03-07 Simpler naming for prebuild instances to ...
Wesley J. Landaker 2008-03-07 Interactive progarm now supports all three ...
Wesley J. Landaker 2008-03-07 Refactored phase shifting code. Added ...
Wesley J. Landaker 2008-03-07 Note that PSDONE is latched.
The first merge is indented by 2 spaces like everything else. All the following merges are shown indented by 4 spaces. These merges have NO hierarchical relationship, which is what this indentation implies.
I've ran into this since bzr 0.9x, but it's finally bothered me enough to report a bug about it, since this still shows up with bzr 1.2. =)
Hi Wesley,
Thanks for taking the time to file this bug! I'm afraid that the behaviour you describe is actually intentional, and visualises accurately what happens in a merge. When you merge in a branch, you are in fact merging in the last revision of the branch (the tip), which is indented 2 spaces. This revision depends on all of the other revisions, which won't actually be merged into the mainline (but will be part of the dependencies of the mainline) and so they are indented 4 spaces. This might be more obvious if you use the bzr-gtk plugin's 'bzr viz' command to examine the history in a more graphical manner.
As such, I'm marking this bug invalid. If you think that something different really should be happening, then this discussion would be better continued on the mailing list, which can be found at https:/ /lists. ubuntu. com/mailman/ listinfo/ bazaar.
Thanks,
Dan