=== jelmer_ is now known as jelmer === _thumper_ is now known as thumper === SamB_ is now known as SamB === Logan__ is now known as Logan_ === jam1 is now known as jam [11:53] Hi all. How can I remove old and no-longer-needed data from .bzr? Something like "git clean -dxf" or "svn cleanup". [11:54] rindolf: what do you mean? [11:54] rindolf: ignored files that you don't add to the repository? [11:54] rindolf: bzr clean-tree --help; maybe? [11:54] zyga: no, the junk/cruft inside the ".bzr"/dot-bzr. [11:54] ah [11:54] bzr pack --clean-obsolete-packs ; should do it [11:56] Thanks! [11:56] zyga: thanks, let me try. [12:02] zyga: OK, I did it and it was time consuming and .bzr is still 296M whereas the working copy directories are 150M. [12:03] rindolf: well, bzr keeps all history so it's well expected that the history folder (.bzr) is larger than the working copy [12:03] zyga: but that's not the case for it in .git. [12:03] rindolf: there is no other cruft to remove I'm afraid, bzr keeps the history and a few indices to find the data [12:03] rindolf: it is [12:03] rindolf: git keeps the history just as bzr [12:03] zyga: at least not usually. [12:04] rindolf: I don't believe you are correct, unless you do "shallow" clones that ignore all the history apart from the few most recent changes [12:04] rindolf: bzr can do that too [12:04] rindolf: you can create a lightweight checkout of an existing branch that will *not* keep the history locally [12:04] rindolf: depending on how you work that might be useful to you [12:05] zyga: OK. [12:06] Since the current state is inferred from the history that got us here, information theory states that the history is necessarily at least as large as the state itself [12:06] rindolf: you can do a lightweight checkout with bzr checkout --lightweight URL [12:07] * zyga thinks that sliding history window would be a nice backup feature if bzr scaled well for large binary files [12:07] LeoNerd: I think git compresses the history though. [12:07] anyway, back to work [12:07] rindolf: bzr does as well [12:08] rindolf: you might be using an older format that has less efficient compression, you can run bzr upgrade --2a; to get the latest format; then re-do the pack command as above [12:08] rindolf: if you had started with an older repository format this will usually save some space [12:09] zyga: thanks. [12:09] zyga: «The branch format Meta directory format 1 is already at the most recent format.» [12:10] rindolf: then that's the best bzr can do for you now [12:12] zyga: OK, thanks. === mbarnett` is now known as mbarnett [15:25] git gc does gc unref'd revs, which bzr pack doesn't. Usually not a huge difference, but special cases can make it bigger. [15:26] ('course, git clean _is_ straight analogous to bzr clean-tree; it's a WT operation, not a history one) [15:31] fullermd: is there are way to 'git gc' in bzr from the command line? [15:33] The part that does repacking/recompressing/whatnot, sure, that's what bzr pack does. The part that gc's stuff, no. [21:53] hello, i have 2 separate trees: call them 'code' and 'tests'. i'd like to merge tests => code and have both code and tests in a single branch [21:53] is there a way to do this while preserving the history of 'tests' [21:53] is it as simple as a bzr merge? [21:55] hm, no. [21:55] maybe it's bzr join ? [21:57] http://stackoverflow.com/questions/9849466/how-to-combine-repositories-into-a-single-one-in-bazaar [21:57] achiang: yep, bzr join sounds like what you are looking for [21:57] i can't figure out the join syntax though, even after looking at the help [22:00] https://answers.launchpad.net/bzr/+question/71563 [22:01] if i have modern bzr (post 12.04), do i need to do anything specific to get rich-root? [22:03] uh, i have branch format 7, whatever that means [22:04] oh, ok. and repository format 2a [22:04] hopefully that's good enough to try join [22:06] jelmer: any clues? [22:07] Plenty. Rich root worries are mostly a pre-2.0 thing. To use join you'd just stick one branch under another and then run the command on it. [22:07] And then commit it, of course. Join is really just a bit of sugar around merge. [22:08] what fullermd says :) [22:08] hm. ok [22:09] Well, in that case, fullermd also gets a 20 foot high pile of gold coins delivered to his front door today ;p [22:11] confused... :-/ http://pastebin.ubuntu.com/6764485/ [22:14] fullermd: any ideas what i did wrong above? [22:15] zyga: often, git *does* manage to scrunch histories up enough to take less space than the working tree. (This is obviously easier on projects with shorter histories.) [22:16] Do those branches have any shared history? [22:16] fullermd: they really shouldn't [22:16] fullermd: no, they do not have any shared history [22:17] Well, that says they have the same root id. Which I guess without shared history means they're old enough to have come from pre-rich-root branches, which all have the same root. [22:17] So I guess your best bet is to just use merge, then mv all the files into a subdir. [22:18] i tried that and got a different error [22:18] At one time there was a plugin called merge-into or something that would automate it, but I think it was abandoned when join came around, so I doubt it still works. [22:19] IWBNI merge had an arg that could do that... I think a unicorn is scheduled to deliver it next week. [22:19] oh wait [22:19] i screwed up my cp -a before [22:19] let me try again with fresh branches [22:19] i bet it will work [22:19] You can just use 'branch' instead of cp to do it. [22:19] e.g., (cd trunk ; bzr branch ../tests) [22:23] ok, will try that [22:30] fullermd: ok, it works much better when you do not overwrite .bzr/ in the containing tree ;) [22:30] Oh, yes, that might have bad side effects. [22:32] thanks [22:39] SamB: this is true of bzr as well, both use compression [22:50] i have a local branch that takes a long time to pull. i'd like to update this branch with the contents of another test branch that's been pushed up to LP (but not merged into trunk yet). [22:50] is there a way to do so without introducing an actual merge in my local branch? [22:52] maybe it's bzr merge --pull [22:53] yay, that did it