Comment 1 for bug 199655

Revision history for this message
Dan Watkins (oddbloke) wrote :

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