[02:47] <Noldorin> jelmer, how's progress on work?
[14:37] <odin_> hi I am getting some bzr error, "ERROR you have edited foobar.install instead of foobar-huh.install, please undo/merge changes"
[14:37] <odin_> makes no sense, "bzr status ." does not indicate anything on these files
[14:38] <odin_> I just want it to accept the current tree as the new version and commit all
[14:39] <odin_> no one else is working on this tree, and as far as I know this is the only copy that has been checked out
[14:39] <jelmer> odin_: I don't think that's an error from bzr itself. Perhaps it is from a plugin you have loaded?
[14:39] <odin_> well I am only using normal commands
[14:40] <odin_> it will be a ubuntu package management plugin
[14:40] <jelmer> odin_: can you pastebin the output of "bzr plugins" ?
[14:40] <odin_> status/add/commit/push
[14:41] <jelmer> that error message isn't in the bzr codebase, so it must be from some plugin
[14:42] <jelmer> odin_: do you mean bzr-builddeb?
[14:42] <odin_> pastebin.com/WkNcZdik  (typed in)
[14:42] <odin_> I am not using bzr-builddeb at this time, just status/add/commit/push
[14:43] <odin_> bzr status .  # is clean
[14:43] <jelmer> what's the eaxct error message you get, and for which command?
[14:45] <odin_> opps my bad
[14:45] <odin_> there is a safety measure in the script that stops you from editing the wrong files
[14:46] <odin_> the script front-ends  status/add/commit/push to allow 1 debian/* to target 4+ versions of ubuntu
[14:50] <jelmer> aha
[14:50] <jelmer> no wonder the error string wasn't in the bzr codebase :_)
[17:00] <Wellark> hi!
[17:00] <Wellark> where can I find documentation how daily PPA's are configured in launchpaD?
[17:10] <jelmer> Wellark: hi
[17:10] <jelmer> Wellark: see https://help.launchpad.net/Packaging/SourceBuilds/GettingStarted
[17:14] <Wellark> jelmer: thanks!
[18:08] <LeoNerd> Can there -please- be a flag to  bzr up  something like  --abort-if-diverged  so that  bzr up  becomes an error on divergant history, rather than doing a reverse merge..?
[18:08] <LeoNerd> I get very annoyed by this latter behaviour
[18:09] <LeoNerd> Then I can put that in my aliases file, and on divergant history it'll require me instead to rebase
[18:29] <darKoram> howdy from Austin Texas.  My first time on #bzr
[18:40] <lifeless> LeoNerd: you can use bzr pull instead, which has that behavior
[18:40] <LeoNerd> Hrm.. hard habit to get out of I guess. I tend to just "bzr up" most of the time
[18:40] <LeoNerd> Mostly because after "bzr co", up will work whereas pull will not
[18:41] <LeoNerd> Because you have to type the URL a total of 3 times before all the commands remember it
[18:42] <lifeless> LeoNerd: well, if you want to rebase rather than merging, you explicitly don't want bzr co to work after pull does anything, right ?
[18:42] <LeoNerd> Hrm?
[18:42] <LeoNerd> No, usually I  bzr co  to make my checkout initially
[18:42] <LeoNerd> rather than branch
[18:42] <lifeless> I didn't suggest you stop using bzr co
[18:42] <LeoNerd> If you co then a plain "bzr pull" claims it doesn't know what to pull from
[18:42] <LeoNerd> So the first time you type it you have to put the URL in again
[18:43] <lifeless> thats true
[18:43] <LeoNerd> I've started to get into a habit of immediately after bzr co, cd'ing into the workdir, then doing bzr missing <Alt+.><Enter>bzr pull <Alt+.><Enter>bzr push <Alt+.><Enter>
[18:43] <LeoNerd> just to reuse the bash history of the URL, and save some typing
[18:43] <LeoNerd> Otherwise it's an annoyingly inconvenient  bzr info  then copypaste the URL off the screen
[18:43] <LeoNerd> I still don't know why those can't be prefilled
[18:54] <jelmer> LeoNerd: doesn't "bzr pull :master" work?
[18:55] <LeoNerd> I've never heard of that.. what does it do?
[18:55] <jelmer> LeoNerd: sorry, :bound
[18:55] <jelmer> LeoNerd: see "bzr help location-alias"
[18:55] <jelmer> LeoNerd: it's an alias for the location of the master branch
[18:56] <jelmer> LeoNerd: that said, I agree we should fix "bzr up". The current behaviour might be useful in some cases, but is also a bit surprising.
[18:56] <darKoram> I recently created a bzr repo for my development work and uploaded it to Launchpad.  I'm now having serious problems with the drive it was on and need to re-format it.  Is there anything i need to do to make sure pulling back down from lp goes smoothly afterwards?
[19:00] <jelmer> darKoram: no, you should be able to just run "bzr branch lp:YOURBRANCH /local/path" later, presuming you pushed the branch to launchpad before your disk was corrupted.
[19:03] <darKoram> ok... gonna try it.  Thanks!
[21:27] <poolie> hi all
[23:08] <poolie> lifeless, incidentally the auto reconnect stuff should now be landed in bzr trunk
[23:08] <poolie> i think it will need to be tested there for a while before it can go into stable series though
[23:08] <poolie> but, that should make things a bit easier for lp
[23:32] <jelmer> poolie: it hasn't yet, that's the branch that's making PQM
[23:32] <jelmer> hang
[23:33] <poolie> :/
[23:33] <poolie> interesting
[23:33] <poolie> maybe pqm ought to run it under a timeout
[23:43] <jelmer> yeah, that would help for cases this like
[23:43] <jelmer> otoh, it's not really common for this to happen
[23:44] <jelmer> poolie: and we're migrating to tarmac anyway, right ? :-)
[23:48] <poolie> right
[23:48] <poolie> maybe i should pilot it this week