From: Bjorn Munch Date: December 21 2010 9:41am Subject: bzr commit into mysql-trunk-bugfixing branch (bjorn.munch:3456) List-Archive: http://lists.mysql.com/commits/127364 Message-Id: <201012210941.oBL9fA6c002517@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1207420596==" --===============1207420596== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/bug-tr/ based on revid:alexander.nozdrin@stripped 3456 Bjorn Munch 2010-12-21 fixed branch name modified: .bzr-mysql/default.conf === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2010-12-20 14:57:35 +0000 +++ b/.bzr-mysql/default.conf 2010-12-21 09:41:02 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-trunk-mtr" +tree_name = "mysql-trunk-bugfixing" --===============1207420596== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/bug-tr/ # testament_sha1: 75d2b1c8ba8c9442b2bd965f7c5ccc8e5d435f3b # timestamp: 2010-12-21 10:41:10 +0100 # source_branch: file:///home/bm136801/my/mtr-tr/ # base_revision_id: alexander.nozdrin@stripped\ # 86sk8iflvxl1tc5k # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY0ECXYAAVffgCAQUGP/91IC AAC///9wUAM9eUAkAQymkk/TSeRT2p5Tak8k02pmmppjUAYAaaNBpiAAABkAYAaaNBpiAAABkAVt SepoNTCaYExBpgE0aaAkkJoBonpMRkQJmkyaJ6mn6pUa5kZvlAZBtYIjQGIo2FInDvXkAM7y9mqY JSMLmrk/H6t3lohHW2PWt68dhRRGAZ+Hu0eAQw28o7aDCNtVAOLZpFKqA4rF1dEYIyZy2NYPEMkc HOSfkqLk+CBk9OT+zOsXB9gzB+OXxARVYKNyCZtu9Oe5MBDaUF8O49y/UrSqPGnpI7poNc8ozYXF AZsE5rWLlQshWwoQqBFyiJhEX5yZaVFJTBr2CfootZZe/4OFdtgxE1M4K8TWPuHzg6bVjROsyXMn fy6CZcVeqSTGvR64EoqfXVcaMLbVla2NkfKMlmVfeBVMKGYvOCvssUifjvyFhKuKezl0Vfgz7c8l gWVpmFx0hVUbGdNUnFrJxS+ibs2oe4i5NFoFIRpbf2Gyvr2mPbT59fWKZKylmTfvZ90bni/2p50c GqNRnkzryHzGd37eqRfyqlAOC9v6KanQd1K5GqyXtI8y/Y3Gd97O7ibtHwWhtD14rnQ29jnHpySN tWZI7JGDKkl0jSVmxFloXjwhJTC+HzgE9i7T1xIOdPQJu425hBW6q7DUEc4BMm4589lbMnwgpdQ9 DZc9t6tf0gaPBUaC0CUuF+8yoOSin4Kv0zkYnuOB5kb3nv6e/t40KUCA7tZWhzgWYUY9FasjDMt9 +6aio81knmNS8gt8/7pjDgG68Q6XkIdRfP+ActGiuy1DVfw5hkohc8GF1rSGOq5psmF1kypmvykb KK1sNKIQNF9AU/NTqWAbxZ6bTwJWjAUA5UA41h82rNFDJljdmCeHZyef8kahFfxBk9S1Wk9GZOIf QsFVOMVy2NKQyTFiS8CRQiveRTz2Va1ZBXDGMIMvwnShabtVgDfCpV32VFKMdMl++IoQ8jD6Trsy unLrcSVgWrXi5ouXGQrxTxOkl32Asv5q5aBksBOWB2TlUJwqz0TpFgZZ/i7kinChIRoIEuw= --===============1207420596==--