[09:49] <Saviq> hi, is it possible to set a default stacking branch for branches under a directory?
[09:49] <Saviq> i.e. we have lp:unity/phablet and pushing without explicit --stacked-on ... tries to stack on top of lp:unity
[09:49] <Saviq> but the two don't have any common history
[09:49] <Saviq> so we're pushing the whole thing every time
[09:50] <Saviq> any pointers on how to improve that?
[09:52] <mgz> actually create seperate projects fro seperate projects?
[09:53] <mgz> launchpad stacking is special cased for how launchpad wants you to lay things out
[09:53] <mgz> it expects code under one project to share history
[19:02] <kate`> hiya. i'm trying to convert something from svn to bzr, and confusing myself an awful lot in the process
[19:03] <mgz> hey
[19:03] <mgz> you might get a good response if you post the details of the conversion on the bazaar mailing list
[19:04] <kate`> way back when, i had three seperate svn repositories. at some point i combined all these into one (by dumping them and 'svnadmin load'ing them into different subdirectories) - and then i continued development from that point onwards, in one single repository
[19:04] <mgz> the people who've dived in those waters should see it there
[19:04] <kate`> well, maybe :)
[19:04]  * fullermd read that as "died in those waters"...
[19:04] <kate`> i'm wondering how's the best way to represent this in bzr.. clearly i could just convert the repository as-is, but i want those histories to appear in paralle, as they're unrelated until that point where they combine
[19:05] <kate`> i.e. i don't want a linear history with the work on those three things interspersed
[19:05] <mgz> that sound doable, but potentially not simply
[19:05] <kate`> what options can i consider? i could use svn's dump filter things to split those apart again
[19:07] <kate`> i thought either i can leave this as one giant repository and try to have bzr svn-import understand that merging, or: i could convert them seperate, merge in bzr, and then somehow svn-import the rest of the work after the merge
[19:07] <fullermd> That last step would be the really tricksy part.
[19:12] <kate`> yeah
[19:12] <kate`> can svn-import import after existing commits?
[19:16] <kate`> or: are there any other ways to go about this? i'm not really sure how this history *should* look
[19:16] <kate`> i assume these three origional svn repos should become branches in bzr
[20:32]  * jelmer waves
[20:33] <jelmer> kate`: svn-import can import after existing commits, but it won't recognize merges that were not made with bzr
[20:37] <kate`> ok. so does my plan to seperate back out my svn repository into three before-the-merge and one after-the-merge sound sane, with doing that merge by hand in bzr?
[20:38] <kate`> i.e. to svn-import them to three seperate bzr repositories, rather than branches within one repository or something
[21:06] <jelmer> kate`: I don't think that will work, if the three different branches don't have shared history
[21:06] <jelmer> (shared history where svn/bzr is concerned, that is)