[00:13] okay, that only took me all evening [00:14] but have a build of pyqt that works with trunk python here so can be used with trunk bzr === zyga is now known as zyga-afk [00:25] where is the syntax of BZR_PLUGINS_AT actually documented? [00:26] http://doc.bazaar.canonical.com/beta/en/user-reference/configuration-help.html#bzr-plugins-at [00:31] but... bzr-explorer still doesn't want to run inplace for some reason [00:35] meh, I need the dir named 'explorer' not 'bzr-explorer'... what's the point of the @ then? just take the last dir component. [00:36] and now it's bed time again. [00:40] http://paste.ubuntu.com/843793/ [06:30] how do I delete a wrong tag in LP bzr? [06:36] is there a program all you guys use to look at diff files? [07:05] hi. [07:05] hi === zyga-afk is now known as zyga [09:26] sorry, I've forgotten [09:26] how do I fetch a new remote branch into my colo repo? [09:39] morning [09:42] mgz: hi [09:42] I need some help with colo [09:42] I've forgotten how to fetch a new remote branch into a colo [09:42] And now I'm getting conflicts sometimes when I switch branches [09:43] that doesn't make any sense to me. [09:45] hey jml [09:46] it's possible to get conflicts when switching if, for instance, a directory didn't exist but has other contents in your tree [09:47] or is it something else? [09:47] mgz: hmm. maybe it is that. [09:48] * jml looks [09:48] I can't remember if there was a fancy way to branch into a new colo dir, but `bzr branch remote file:,branch=newlocal` should work [09:48] mgz: no, it's a text conflict in NEWS and a couple of other files [09:49] mgz: in this particular branch, I'm switching from testtools-0.9.12 to testtools-0.9.13. Am really perplexed by the conflicts. [09:50] jml: and the tree was in a clean state when doing it? that would be odd. [09:55] mgz: yeah, no text changes etc. [09:56] mgz: http://paste.ubuntu.com/844150/ [09:57] mgz: easy enough to reproduce the problem. [10:00] mgz: further, I have no idea what to do when I get a conflict like that. [10:01] well `bzr revert . && bzr resolve` I guess [10:02] the basic transform between .13 and .12 works fine here [10:03] so, I guess there must be a more specific bug, if you would do the honour of filing that jml? [10:05] mgz: sure thing. [10:07] mgz: https://bugs.launchpad.net/bzr/+bug/933362 [10:07] Ubuntu bug 933362 in Bazaar "Unexpected conflict switching within colo branch" [Undecided,New] [10:08] ...well, I've just got myself in a weird state trying to replicate your setup [10:09] I wanted a colo branch, but somehow have "Unshared repository with trees and colocated branches (format: 2a)" [10:09] and now can't do any operations in that dir, as it's not a branch. [10:17] mgz: huh [10:17] mgz: the pastebin starts from scratch, fwiw. [10:18] incidentally, I wish I knew what public API python-subunit had so I could clean up some of these unnecessary imports. [10:19] hmm, now, to figure out how these tests manage to pass [10:20] yeah, I was trying to be clever by creating the branches in a slightly different way to see if it was swtich -b at fault [10:20] but screwed up the first step [10:21] `bzr branch testtools file:colotesttools,branch=trunk` does the weirdness [10:23] jml: well, either everything without an underscore, or I guess having a look at what using subunit and being pragmatic [10:23] in general, I think I quite like colo, but one thing it makes slightly harder is opening up the trunk version of a branched file for side-by-side comparison. [10:24] mgz: ISTR subunit deliberately exporting 'content' and 'content_type' from testtools. ICBW though. [14:04] Hey guys, I want to merge some changes I accidently made in my trunk branch (but havent yet commited) into a new branch [14:04] so ive made the branch, but now I want to commit to that branch, not to my current one, how do I do that? [14:12] the easy way is just to do `bzr branch trunk new_feature` then `bzr pull --overwrite -r-4 trunk trunk` [14:12] the starting state of trunk is what you want in your feature branch [14:12] and then you can just chop off the last N revisions from trunk [14:13] ...the second command may be wrong, but there is a way of doing that (or you can just uncommit several times) [14:29] why can't there be two bzr command running on the same repo simultaneously? [14:30] leo2007: there can be multiple commands running on the same repository [14:30] leo2007: you can't write to the working tree state file with multiple processes concurrently though === jordan__ is now known as jordan [16:11] jelmer: What do you think of using the colocated branch name as default nick? I've got an mp up for that, but poolie wanted to see what you thought. https://code.launchpad.net/~abentley/bzr/name-nick/+merge/93319 [16:15] abentley: I thought I'd replied, but something seems to have eaten my email [16:16] abentley: I think that's a good idea, I'll review again [16:16] jelmer: great. Thanks. === deryck is now known as deryck[lunch] [17:38] jelmer: landing. At last. [17:39] jelmer: poolie suggested putting my "nc:" plugin in core, perhaps as "x-nc:" to indicate experimental nature. Any thoughts? [17:41] abentley: I haven't looked at the code yet.I think it would be reasonable to add it as nc: or x-nc: [17:41] abentley: Of course the goal is to eventually just support passing colocated branch names to commands [17:42] abentley: but in the mean time it would be very useful; plus, I don't think there's a clear disadvantage in supporting it [17:43] I'm not sure if "nc" is the best prefix, though I don't really have any brilliant ideas on a better prefix [17:43] no contest. [17:43] jelmer: I'd use colo if the plugin didn't use it already. [17:44] hmm, yeah [17:46] jelmer: "ncolo:"? [17:47] jelmer: "jcolo" ? :-) [17:50] abentley: perhaps just "co:" ? [17:50] kolo would be cooler, and it's jelmer, so, should use [17:50] jk: [17:51] jelmer: wfm. [17:52] mgz: I didn't realize using a k makes something cooler, let me make a note of that :) === deryck[lunch] is now known as deryck [20:48] jelmer: It doesn't. It makes it kooler. [22:02] hey all [22:02] hey all [22:02] I am trying to branch and keep getting: [22:02] ConnectionReset reading response for 'BzrDir.open_2.1', retrying [22:02] Permission denied (publickey). [22:02] bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist. [22:02] I imported my public key after I did bzr launchpad-login [22:05] if you do `ssh yourusername@bazaar.launchpad.net` what do you get? [22:05] if you still have a key error, that's what needs fixing, if it says no shells, you've done everything right [22:11] jono: any luck? [22:11] wgz, still no luck [22:11] wgz, we are discussing this in #launchpad [22:12] I think this is a key error [23:09] "Permission denied (publickey)." strongly suggests a key problem, yse. [23:09] *yes