From: Bjorn Munch
Date: May 13 2011 9:22am
Subject: bzr commit into mysql-trunk branch (bjorn.munch:3080)
List-Archive: http://lists.mysql.com/commits/137297
Message-Id: <201105130922.p4D9MCTO019884@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1358263577=="

--===============1358263577==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/main-tr/ based on revid:alfranio.correia@stripped

 3080 Bjorn Munch	2011-05-13
      fix Tree name after accidental push

    modified:
      .bzr-mysql/default.conf
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-05-12 13:49:50 +0000
+++ b/.bzr-mysql/default.conf	2011-05-13 09:22:01 +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"


--===============1358263577==
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/main-tr/
# testament_sha1: f1b2ce1e21ff5179f199f23603d52b055615017f
# timestamp: 2011-05-13 11:22:12 +0200
# source_branch: file:///home/bm136801/my/mtr-tr/
# base_revision_id: alfranio.correia@stripped\
#   c1b5kmum4h52g0ni
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT5GHR0AAVtfgAAQUGP/91IC
BAC////wUAM63Z3LCTz3ugkkRomTAEZMmk1PJNG1PU9I9T1BJRDTJkGphJ6mI0NAABoNCaaFPRoU
8kzUNPUZPU9R6gDIG1TUaajIAaaGmgNAAACSKm0mTQA9QDQAAABJbRrVmKYMLJVGRQBt1XuaG46/
BTM9ay+lbrNEPTOHPw87f78vpjbuwQ9t3aqmy25OZGhL5W3YeBEwptFfvpWmdNlb8kh64JwF7H1T
3wciHc1toI5N3MEZJ7WPHIvvIxVPZ8ds7jTI2wRap43JkKE60Z1hlBWZR8HK4I75WniFH3VB9bJK
YJvhlzt3qMiJqFia5aYeDCWhY04uwTKaoThD6kyYHlYmJCk8iaERKppQv7mJgWNbmUwVLIuMCUwr
tkhvgViBGE0Y0BwGAuq4qF4ioGBxTL9ZRasbM5xFbQoeE61CKdOMpbWrW/TlGIXGonlarMihbNB6
ohhw6mUhdYoi4bKRYrYKBIiEwcooLdxODJBYm+0IIIRwNREBon2eYPvu2fa8e1/zrrqmSnkZk3fJ
9BPQ8XmV4wZTW48Vv9XcKevRIfFVmQrgGFlyouT4wsoRIua6UEfBU6uITC505mgzv2z+K66DSLlt
0FVA9hzVe+8RjCDmSOqRUwuIt1edhs5E06gp+g+JciKqQWG9oR8R0gvxqe9jArWxsuv0UK+7eOVV
WQySkwEzvFnKpUQcaG44BcCxeTPY2+EDxDUkJ5UW5OGM7xEB5JWUywLRAJbRIZ5acZnDsli7rtT0
ZGaZBQEG9cFeUJleWg4q+PKnc9RQyME4ur7Bt+t1r51aG5cQ4URRdsgLpWvDosFZ6MIUBQ4Zp0hi
VYE1zp3ZTcRDpo5VVTzkYSSGpZF1Am5zvM7gOo0lehgJQgDR0KChfFBkyjSxNjSGSrYiXsFkSrRA
/CUhO8vUYKHOGUV0kwqc5YDpsmmEEl1XLnabE9Et9pBFm1oZsQQonQs4OjZZp1kU9GTia+4HSrr8
6kxKi7nWub3+Rq5hPxloQfljIuUQktuTWOasdwrRYX2rcubAIS1CKzB8mpwqazRWOHb/8XckU4UJ
A+Rh0dA=


--===============1358263577==--