{"id":2382,"date":"2011-05-21T22:59:45","date_gmt":"2011-05-21T12:59:45","guid":{"rendered":"http:\/\/www.flamingspork.com\/blog\/?p=2382"},"modified":"2011-05-21T22:59:45","modified_gmt":"2011-05-21T12:59:45","slug":"howto-fix-bzr-join-error-of-trees-have-the-same-root","status":"publish","type":"post","link":"https:\/\/www.flamingspork.com\/blog\/2011\/05\/21\/howto-fix-bzr-join-error-of-trees-have-the-same-root\/","title":{"rendered":"HOWTO fix: bzr join error of “Trees have the same root”"},"content":{"rendered":"

From\u00c2\u00a0https:\/\/answers.launchpad.net\/bzr\/+question\/71563<\/a><\/p>\n

\u00ef\u00bb\u00bf\u00ef\u00bb\u00bfyou can do it from within Python like this:
\n>>> import bzrlib.workingtree
\n>>> bzrlib.workingtree.WorkingTree.open(“subdir2”).set_root_id(“tree_root_subdir2”)<\/p>\n

Hopefully I can find this easily in the future (have had to use it before)<\/p>\n","protected":false},"excerpt":{"rendered":"

From\u00c2\u00a0https:\/\/answers.launchpad.net\/bzr\/+question\/71563 \u00ef\u00bb\u00bf\u00ef\u00bb\u00bfyou can do it from within Python like this: >>> import bzrlib.workingtree >>> bzrlib.workingtree.WorkingTree.open(“subdir2”).set_root_id(“tree_root_subdir2”) Hopefully I can find this easily in the future (have had to use it before)<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"jetpack_post_was_ever_published":false,"_jetpack_newsletter_access":"","_jetpack_dont_email_post_to_subs":false,"_jetpack_newsletter_tier_id":0,"_jetpack_memberships_contains_paywalled_content":false,"_jetpack_memberships_contains_paid_content":false,"footnotes":"","jetpack_publicize_message":"","jetpack_publicize_feature_enabled":true,"jetpack_social_post_already_shared":false,"jetpack_social_options":{"image_generator_settings":{"template":"highway","default_image_id":0,"font":"","enabled":false},"version":2}},"categories":[1],"tags":[100],"class_list":["post-2382","post","type-post","status-publish","format-standard","hentry","category-general","tag-bzr"],"jetpack_publicize_connections":[],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"jetpack_shortlink":"https:\/\/wp.me\/p5a6n8-Cq","jetpack-related-posts":[{"id":2380,"url":"https:\/\/www.flamingspork.com\/blog\/2011\/05\/21\/xtrabackup-bazaar-repositories-upgraded-to-2a-format\/","url_meta":{"origin":2382,"position":0},"title":"xtrabackup bazaar repositories upgraded to 2a format","author":"Stewart Smith","date":"2011-05-21","format":false,"excerpt":"I have just upgraded the xtrabackup bazaar code repositories to the 2a format. This means that bzr 1.16 is required to access the source code repositories now. If you get an error like the one below when working with a local branch, you'll need to run \"bzr upgrade\" in it\u2026","rel":"","context":"In "percona"","block_context":{"text":"percona","link":"https:\/\/www.flamingspork.com\/blog\/category\/work-et-al\/percona\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":1016,"url":"https:\/\/www.flamingspork.com\/blog\/2008\/02\/22\/bzr-loom-a-bzr-plugin-with-quilt-like-functionality\/","url_meta":{"origin":2382,"position":1},"title":"bzr-loom – a bzr plugin with quilt like functionality","author":"Stewart Smith","date":"2008-02-22","format":false,"excerpt":"A bzr plugin to assist in developing focused patches. in Launchpad I use quilt a lot for development. Currently, If I had to choose between BK and quilt - I'd choose quilt. I use bzr in other development projects like MemberDB. I use git as a frontend for SVN (it\u2026","rel":"","context":"In "MemberDB"","block_context":{"text":"MemberDB","link":"https:\/\/www.flamingspork.com\/blog\/category\/memberdb\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":1919,"url":"https:\/\/www.flamingspork.com\/blog\/2010\/05\/20\/exporting-a-set-of-bzr-revisions-as-a-quilt-series\/","url_meta":{"origin":2382,"position":2},"title":"Exporting a set of bzr revisions as a quilt series","author":"Stewart Smith","date":"2010-05-20","format":false,"excerpt":"There has to be a better way than this... but it does work (at least for revisions 11 through 141): for rev in `seq 11 141`; do if [ -z \"`bzr diff -r\\`expr $rev - 1\\`..$rev|diffstat -p0 -l|grep ^tests`\" ]; then (bzr log -r$rev --forward --log-format=long | sed -e 's\/^\u2026","rel":"","context":"In "General"","block_context":{"text":"General","link":"https:\/\/www.flamingspork.com\/blog\/category\/general\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":3413,"url":"https:\/\/www.flamingspork.com\/blog\/2013\/09\/24\/disk-usage-bzr-vs-git\/","url_meta":{"origin":2382,"position":3},"title":"Disk usage: bzr vs git","author":"Stewart Smith","date":"2013-09-24","format":false,"excerpt":"For MySQL 5.1, 5.5 and 5.6 in the same repository, after repacking: bzr: 269MB (217MB pack, 52MB indicies) git: 177MB repo (152MB pack) One thing I'll say is that BZR is always more chatty over the network and is substantially slower than GIT in pulling a fresh copy.","rel":"","context":"In "code"","block_context":{"text":"code","link":"https:\/\/www.flamingspork.com\/blog\/category\/code\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":1749,"url":"https:\/\/www.flamingspork.com\/blog\/2009\/11\/16\/bazaar-importmbox-plugin\/","url_meta":{"origin":2382,"position":4},"title":"Bazaar importmbox plugin","author":"Stewart Smith","date":"2009-11-16","format":false,"excerpt":"Releasing and announcing software is win! I've had this bumming around for a bit, and for me (and I think others hacking on MySQL) it's been rather useful. Simple plugin that takes each email in an mbox, applies the patch and commits it with the correct author to a bzr\u2026","rel":"","context":"In "drizzle"","block_context":{"text":"drizzle","link":"https:\/\/www.flamingspork.com\/blog\/category\/work-et-al\/drizzle-work-et-al\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]},{"id":590,"url":"https:\/\/www.flamingspork.com\/blog\/2006\/02\/20\/bzr-the-website-dude\/","url_meta":{"origin":2382,"position":5},"title":"bzr the website dude","author":"Stewart Smith","date":"2006-02-20","format":false,"excerpt":"I'm currently in the process of trying out Tailor to convert the CVS repository that stores the revision history of my website to bzr. I've been meaning to try bzr again for ages, and here's the excuse. I'm going to see if this is going to work well for me.\u2026","rel":"","context":"In "website"","block_context":{"text":"website","link":"https:\/\/www.flamingspork.com\/blog\/category\/website\/"},"img":{"alt_text":"","src":"","width":0,"height":0},"classes":[]}],"jetpack_likes_enabled":true,"_links":{"self":[{"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/posts\/2382","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/comments?post=2382"}],"version-history":[{"count":1,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/posts\/2382\/revisions"}],"predecessor-version":[{"id":2383,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/posts\/2382\/revisions\/2383"}],"wp:attachment":[{"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/media?parent=2382"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/categories?post=2382"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.flamingspork.com\/blog\/wp-json\/wp\/v2\/tags?post=2382"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}