=== jamesh_ is now known as jamesh [10:57] I'm getting a tree transform that's malformed... can I somehow just reset everything and try and update again? [10:58] somehow bzr revert && bzr update fixed it [10:58] no idea how tho [11:07] 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] both pidgin++ and the plugins live on separate branches [11:08] 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] it would be nice if there was some way to merge diverged branches... or maybe there's some better approach? thanks === mark06 is now known as mark06-away === mark06-away is now known as mark06 === mark06 is now known as mark06-away === mark06-away is now known as mark06 === mark06 is now known as mark06-away === mark06-away is now known as mark06 === mark06 is now known as mark06-away [15:56] mark06-away: you're talking about nested trees === yena_ is now known as yena === mark06-away is now known as mark06 [18:37] thanks for the feedback [18:38] * mark06 decides to download the additional plugins during build and avoid complicating things [21:19] http://bazaar.launchpad.net/~renatosilva/pidgin++/trunk/revision/146 === mark06 is now known as mark06-away === mark06-away is now known as mark06 [21:56] any idea how to fix this? http://i.imgur.com/QUbHigl.png [22:09] hmm, for rev too === mark06 is now known as mark06-away === mark06-away is now known as mark06 === mark06 is now known as mark06-away === mark06-away is now known as mark06