[00:00] <jelmer> that means it's not as accidental I guess, makes me a bit nervous :-/
[00:00] <jelmer> lifeless, what are you running, a bzr release/bzr.dev/whatever is in the lp tree?
[00:01] <lifeless> bzr revno ~/source/baz/bzr-test-fixes/
[00:01] <lifeless> 5809
[00:01] <lifeless> apparently
[00:01] <lifeless> which is apr 21st
[00:02] <jelmer> thanks
[00:03] <lifeless> I'll update to tip
[00:03] <lifeless> not being a bzr dev I've become kinda slack :)
[00:08] <jelmer> :)
[00:08] <jelmer> please let us know if that helps
[00:08] <jelmer> plenary here at 9 tomorrow, which means I should get some sleep
[00:08] <jelmer> g'night!
[00:09] <lifeless> its what, midnight now? sleep well
[00:10] <jelmer> yep, midnight
[00:31] <Kamping_Kaiser> is there a bash bit to display bzr status in PS1 (ala git)?
[00:32] <bob2> http://www.brokenbuild.com/blog/2008/06/30/getting-git-subversion-and-bazaar-version-control-information-into-your-bash-prompt/
[00:35] <Kamping_Kaiser> bob2: thanks. thought there migth be something in bzr, but i'm happy with whatever :)
[04:31] <Kamping_Kaiser> is bzr import-orig meant to revert local changes made to a branch? its just deleted several files i added/modified, and i'm unsure why that would be. its help indicates it should be usable to merge a ds
[04:32] <Kamping_Kaiser> c
[04:43] <Kamping_Kaiser> wonder if its becuse i hadn't tagged a release with my changes (since there was no release yet)
[04:43] <Kamping_Kaiser> so its reset to the tags it had, then upgraded from there.
[04:55] <maxb> import-orig? You mean import-upstream?
[04:56] <Kamping_Kaiser> i don't appear to havea n import-upstream
[04:57] <Kamping_Kaiser> i was refering to import-dsc (sorry)
[05:07] <maxb> import-dsc is intended to be used in a tree without any local changes
[05:07] <maxb> it should probably complain if it doesn't do that already
[05:07] <Kamping_Kaiser> odd. the last paragraph makes it sound like its supported.
[05:08] <maxb> It's strictly an import tool. If you're doing something merge related, it's the wrong command
[05:09] <Kamping_Kaiser> ok. that last para probably needs fixing then
[05:09] <maxb> The last paragraph refers to importing a new version of a .dsc that was prepared by someone unware of the version control system
[05:10] <maxb> I'm not sure how it could be "fixed", I find it a reasonable description of a use-case
[05:10] <Kamping_Kaiser> so its not intended to handle the case where someone does an upload and you've made edits to the vcs in the mean time?
[05:12] <maxb> Oh, I see
[05:13] <maxb> In that case you'll need to branch from the proper point of ancestry for the upload, then use import-dsc, and merge it
[05:14] <Kamping_Kaiser> ok. thanks for clearing that up
[06:11] <Kamping_Kaiser> does bzr often mark files conflicting when they are identical? I've never seen it before, wondering if it happens to otehrs
[06:11] <Kamping_Kaiser> and whats the correct resolution procedure, simply mark it resolved?
[06:33] <bob2> mark = textual conflicts or file-tree conflicts?
[06:35] <Kamping_Kaiser> `bzr conflicts  --text` lists nothing, so i assume file-tree?
[06:35] <bob2> two people adding files with the same name are conflicts
[06:35] <Kamping_Kaiser> fwiw, it was a merge with bzr merge-package
[06:36] <Kamping_Kaiser> i must have chosen the wrong revision as my merge root, as those files are upstreams
[11:34] <ssbr_> What places are there to host bzr projects, other than launchpad?
[11:39] <jave> I have a local bzr repo that I would like to be able to push to github. is "dpush git" the correct solution? dpush seems to be aimed at the remote foreign repo is the master but that is not the case here
[12:20] <gour> ssbr_: SF is one
[12:20] <Kamping_Kaiser> gnu savannah do, and i think gna can
[12:21] <gour> check https://www.mergebox.net/ as well
[12:23] <Kamping_Kaiser> alioth does too, but not sure if its debian only or not
[12:32] <ssbr_> alright, I'll look into these. Thanks!
[12:35] <poolie> vila, hi :)
=== iwata0303 is now known as iwata
[14:02] <maxb> Hi, could someone requeue --auto qbittorrent on jubany please?
[17:00] <poolie> hi maxb
[17:01] <maxb> Hello
[17:02] <poolie> done
[17:03] <poolie> ssbr_: i'm curious if there's something that blocks you using launchpda or if you just wanted to know all the options ...?
[17:22] <maxb> There are 3 bugs containing various other more complex jubany wrangling, but they can all wait for someone to have a reasonable block of time to consider them
[17:34] <poolie> ok
[17:34] <poolie> did you start a ppu proposal?
[17:34] <poolie> i'd like to for jubany access for you but it would help to have a 'who on earth is max' page to point to
[17:38] <maxb> I did not yet - didn't get time over the weekend
[17:39] <poolie> np, just didn't want to stall it
[17:39] <poolie> i have a lot of unread mail
[18:16] <daniel4> hi.  is anyone familiar with hooks: http://doc.bazaar.canonical.com/bzr.2.3/en/user-guide/hooks.html ?  I can't get the first example working because I don't know what "your configuration directory" means--BRANCH/.bzr/ ?
[18:25] <daniel4> ah it means ~/.bazaar/plugins/
=== beuno is now known as bueno
=== bueno is now known as beuno
=== jr__ is now known as Riddell
=== JasonOO is now known as JasonO
=== yofel_ is now known as yofel