It is not an upmerge from 5.1. If it were, the output below would be empty, and bzr merge ../bug1174779-5.1 would be a no-op.
Throughout all versions no need to link bug 1266387, as it's a duplicate of bug 1174779.
bug1174779-5.5$ bzr missing --theirs-only ../bug1174779-5.1/ You are missing 2 revisions: ------------------------------------------------------------ revno: 597 [merge] committer: Tomislav Plavcic <email address hidden> branch nick: 5.1 timestamp: Fri 2014-03-07 00:03:40 +0100 message: Merged with trunk ------------------------------------------------------------ revno: 596 committer: Tomislav Plavcic <email address hidden> branch nick: 5.1 timestamp: Fri 2014-03-07 00:01:16 +0100 message: Replaced MaatKit with Percona Toolkit Updated compilation flags
« Back to merge proposal
It is not an upmerge from 5.1. If it were, the output below would be empty, and bzr merge ../bug1174779-5.1 would be a no-op.
Throughout all versions no need to link bug 1266387, as it's a duplicate of bug 1174779.
bug1174779-5.5$ bzr missing --theirs-only ../bug1174779-5.1/ ------- ------- ------- ------- ------- ------- ------- ---- ------- ------- ------- ------- ------- ------- ------- ----
You are missing 2 revisions:
-------
revno: 597 [merge]
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:03:40 +0100
message:
Merged with trunk
-------
revno: 596
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:01:16 +0100
message:
Replaced MaatKit with Percona Toolkit
Updated compilation flags