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