# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: li-bing.song@sun.com-20100131134835-vhx9dodjnazl7xy4 # target_branch: file:///home/anders/work/bzrwork/worktree3/mysql-6.0-\ # codebase-bugfixing/ # testament_sha1: c00e25c209184b8d701054663c01d28213517277 # timestamp: 2010-01-31 21:51:21 +0800 # source_branch: file:///home/anders/work/bzrroot/mysql-5.1-rep-\ # semisync/ # base_revision_id: horst.hunger@sun.com-20100129112138-\ # 6n6er2tamdlb1ygq # # Begin bundle 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 U//xdyRThQkHEZvTYA==