=== poolie changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: jelmer [07:07] ok good night [07:07] g'nite poolie :) [07:08] drat, its already pub time for you :P [07:20] morning all [07:59] morning all === gcerquant_ is now known as gcerquant [10:00] jelmer_: your recipe-status page wants a new column :) [10:00] mgz: it should automatically add one once there is a build for precise [10:00] * jelmer_ reruns the script [10:04] cool. while I'm bugging you jelmer_, are there user instructions for getting started with colocated branches in core anywhere? [10:05] mgz: not really. do you mean bzr-colo or the colocated branch support that's in the core? [10:07] I mean in core, as I think with the devel format support landing it should be somewhat possible to use now? [10:08] mgz: yep [10:09] basically, use --development-colo to create a directory and then use the ,branch=name syntax to specify a specific branch [10:10] thanks, I will play around. [10:24] hmm. maybe I should just prepare this dpkg upload outside UDD; pretty awkward to work on getting the import fixed while the importer is stopped, I guess [10:24] oh, here, lp:debian/dpkg is up to date now [10:27] woo. massive pile of conflicts, but unblocked. [10:37] do we know what the signal is to restart the importer? james_w said last night we should wait for the branch import which takes ~18 hours [10:44] Hi guys. How can I 'merge' / squash 2 commits into one? [10:46] CaMason_: if they're ones you just did and haven't pushed anywhere, just use uncommit twice then commit [10:47] thing is, these 2 commits are behind another commit [10:48] I want to squash 318..319 together, and I'm at 320 [10:48] You cna't without "rewriting history" [10:48] Rewriting history is bad and evil and upsets anyone who's checked out / branched / etc... since the rewrite. [10:48] one option, there, again provided you've not pushed anywhere public, [10:49] nobody has - this is a local branch [10:49] But if you want, you could e.g. checkout -r318; merge -r320; replay the rest. [10:49] is uncommit, shelve, uncommit, uncommit, commit, unshelve, commit [10:49] or what LeoNerd said is less accident prone [10:49] mgz, ah yes, that would work! [10:49] Oh, a shelve stack. Another possible [10:50] I do tend to get myself into trouble on occasion when I'm juggling too many shelves and uncommits in one branch [10:51] making a new branch from the oldest point and cherrypicking revisions across is less destructive [10:52] I tried a cherrypick with `bzr merge -r 318..319` but it carried across the revisions [10:54] `bzr revert --forget-merges` will always let you lose the explicit merge info [10:54] oops wrong button [10:54] ok thanks. The shelve-stack worked. I'll remember the other suggestions though [10:55] cool! [10:57] also, I was testing these merges in a seperate branch. In git, I'd now do a ff-merge. Would `bzr pull` be about the same? [10:59] you may want --overwrite [10:59] but otherwise yes. [10:59] good stuff. Thanks [10:59] btw, would a shared repository make it quicker to create new branches? [11:01] CaMason_: yes [11:02] (a shared repo by itself doesn't avoid the cost of building the working tree every time, but it does save copying the history) [11:10] I was about to ask you if there was a command to do something like 'bzr ls' [11:10] it turns out there is [11:10] it's called 'bzr ls' [11:10] TIAS++ [11:22] :) [11:34] mgz, it's on the release team's checklist for opening a new series, so we'll get a ping [11:34] mgz, you could ask a l-osa whether the branch-distro is finished yet, and start it if it is [11:41] james_w: great, thanks === med_out is now known as medberry === zyga is now known as zyga-afk [13:43] so, apparently the branch-distro script failed, which blocks restarting the importer. [13:44] there's a log on carob with more information, but I'm not sure how to get there from chinstrap to look. [13:45] as am not allowed agent forwarding, and trying to follow the instructions on the wiki for the alternative setup just fork-bombs myself with ssh processes [13:45] so clearly someone more competent will have to handle this. [13:46] that might mean Monday. [14:05] I doubt it. Nobody's competent on monday... [14:09] :) === zyga-afk is now known as zyga === weigon_ is now known as weigon === medberry is now known as med_out [16:19] jelmer_: Is that .THIS file supposed to be there? [16:19] fullermd: which one? [16:19] added: bzrlib/tests/per_repository/test_fileid_involved.py.THIS test_file_involved.py [16:19] +-20051215205901-728a172d1014daaa [16:20] fullermd: where is that? [16:20] Is that commit you just put through PQM. [16:20] s/Is/In/ [16:20] * fullermd khan tipe. [16:21] fullermd: that's indeed not supposed to be there, thanks. [16:22] PQM mailing again ++. Makes it so much easier for me to pick people to harass in passing 8-} [20:13] hi folks, bzr seems to ignore buildout-templates/bin/lint.in because I have "bin" in my .bzrignore file. aren't bzrignore patterns supposed to be absolute? === med_out is now known as medbrry === medbrry is now known as medberry [20:14] maybe I'm supposed to use ./bin instead of just bin [20:15] for the bin in the root of your project only, yes [20:15] wgz: I now see this is actually well documented, my mistake :) [20:16] wgz: I guess I'll prepend './' to every pattern that's just in the root, just to be extra explicit === yofel_ is now known as yofel [21:37] hi jelmer_ [21:37] hi Noldorin_ [21:38] how's it going? [21:43] Noldorin_: alright, how are you? [21:44] jelmer_, not too bad. just very busy i'm afraid, with my own job(s) now [21:44] jelmer_, so no time to really look into the bzr-git issue, sorry. unless i get really lucky over the next week or so, you will probably beat me to it ;-) [22:14] hi === herb__ is now known as herb [22:34] hi wrv [22:50] does anyone know any simple-ish plugins using pre-commit hooks off the top of their heads? === medberry is now known as med_out [22:54] elmo: I think james_w had a plugin that tried to run a testsuite in pre_commit, let me see if I can find it.. [22:54] jelmer_: actually don't worry, I'm being an idiot - a hook, won't do what I want [22:54] https://launchpad.net/bzr-testrunner [22:54] jelmer_: thanks though