[10:57] <thrustcore> I'm getting a tree transform that's malformed... can I somehow just reset everything and try and update again?
[10:58] <thrustcore> somehow bzr revert && bzr update fixed it
[10:58] <thrustcore> no idea how tho
[11:07] <mark06> I have a plugin for pidgin/pidgin++ I want to include in the main distribution, what's the best way of handling this?
[11:07] <mark06> both pidgin++ and the plugins live on separate branches
[11:08] <mark06> I feel like just adding them to pidgin++'s source code but it's ugly.... it's a duplicated copy which needs to manually be updated whenever plugin's branch is updated
[11:08] <mark06> it would be nice if there was some way to merge diverged branches... or maybe there's some better approach? thanks
[15:56] <jelmer> mark06-away: you're talking about nested trees
[18:37] <mark06> thanks for the feedback
[18:38]  * mark06 decides to download the additional plugins during build and avoid complicating things 
[21:19] <mark06> http://bazaar.launchpad.net/~renatosilva/pidgin++/trunk/revision/146
[21:56] <mark06> any idea how to fix this? http://i.imgur.com/QUbHigl.png
[22:09] <mark06> hmm, for rev too