=== jamesh_ is now known as jamesh [01:14] "Not checking SSL certificate for xmlrpc.launchpad.net" <- eh? [01:18] XML and RPC have already exhausted the TLA support, so it can't do SSL at the moment. === ccxCZ_ is now known as ccxCZ === AfC is now known as AfC|beach === AfC|beach is now known as AfC [08:11] morning === mmrazik is now known as mmrazik|lunch === mmrazik|lunch is now known as mmrazik === mmrazik is now known as mmrazik|otp === mmrazik|otp is now known as mmrazik === mmrazik is now known as mmrazik|afk === _rvba is now known as rvba === mmrazik|afk is now known as mmrazik [15:46] so i shelved some changes [15:47] but i never went back to them and i want to get rid of them. [15:47] in fact i fixed the bug before unshelving them. [15:47] can i somehow discard the shelf?| [15:47] `bzr shelve --list` then `bzr unshelve --destroy N` [15:47] many thanks! [15:48] the first command telling you what N to use (if you used a message when shelving) [15:48] otherwise you can `bzr unshelve --preview` to see which if you hae multiple shelves and no way of telling which is which [15:49] I think the problem is i was trying to do too much stuff at once. Should have just not shelved those changes at all. [15:49] in the first place [15:49] In my manpage i dont have unshelve destroy [15:50] yeah i might have an older version of bzr [15:50] I have delete only which is the same thing though [15:51] it worked fine. [15:52] gah, sorry :) [15:53] one of shelve/unshelve uses destroy, one uses delete, and I always forget which is which === mmrazik is now known as mmrazik|otp === mmrazik|otp is now known as mmrazik [17:28] jelmer: can you have a look at torkvemada's branch? I got him to make the mp more verbose and add some tests based on one of your hook additions [17:40] mgz: Yeah, bzr-git can create branches an dpush to them [17:40] mgz: a somewhat annoying problem there is that dpush itself won't create new branches, unlike push [17:40] mgz: but fixing that requires a bzr core change [17:40] mgz: I'm not convinced about the commit hooks [17:40] mgz: Commit until now was a pretty private object, passing it to a hook seems like a bad idea to me [17:40] wait, now I need to do my lines :) [17:41] is there a better way to do what he wants though? [17:41] mgz: you're a shakespear man, you can handle it. [17:41] Commit.commit takes an impressive list of arguments [17:41] mgz: pass specific arguments to start_commit I guess [17:41] I guess it's just... message, revprops, committer and maybe the two timestamp bits? [17:41] hey, I said that! :) [17:42] :) [17:44] when does Revision._check_properties get called... don't want a hook that can introduce borked properties... [17:44] I guess we [17:44] 'll ship 2.6 beta 2 in quantal? [17:46] seems that's going to happen [17:46] so then it's perhaps not so bad to land a somewhat riskier change now [17:47] having multiple things trying to hit freeze window makes life painful [17:48] yeah [18:57] if I "bzr checkout --lightweight lp:~cr3/checkbox/optical_write_test" and then do this in the directory "bzr st --short -r bzr+ssh://bazaar.launchpad.net/+branch/checkbox/", I get: bzr: ERROR: Server sent an unexpected error: ('error', 'GhostRevisionsHaveNoRevno', 'Could not determine revno for {bzr+ssh://bazaar.launchpad.net/+branch/checkbox/} because its ancestry shows a ghost at {tarmac-20120922215931-44bbvwzadme5c8rd}') [18:58] I don't understand what that means :( [18:59] cr3: there is a reference to a revision that is not present in the repository [18:59] cr3: that revision is necessary for determining the revno [19:00] cr3: -r with a URL doesn't make sense [19:00] -r takes a revision, not a branch [19:01] jelmer: odd, I got that from utilities/find-changed-files.sh in the launchpad source: rev=`bzr info | sed '/parent branch:/!d; s/ *parent branch: /ancestor:/'` [19:01] jelmer: maybe "parent branch" in some contexts is a revision, not a branch. that would explain it [19:02] cr3: no, a parent branch is always a URL [19:02] cr3: "branch:URL" is a revision though [19:02] cr3: so perhaps it's just removing the word 'parent' there [19:02] -rbranch:lp:bzr returns the tip revision of lp:bzr [19:03] jelmer: aha, it replaces "parent branch" with "ancestor", so you have "ancestor:URL" which works fine when I branch a project, not when I checkout though [21:08] that GhostRevisionsHaveNoRevno thing with lightweight checkouts of stacked branches is bug 1049124 [21:08] Launchpad bug 1049124 in Launchpad itself "bzr log -rxxx crashes out with 'ghost' in branch, but not in trunk" [Low,Triaged] https://launchpad.net/bugs/1049124 [21:26] I guess it should just be saying NoSuchRevision? [21:58] jelmer: the cute thing is it actually has the rev... it's just in the stacked on branch, not the immediate branch [22:40] jelmer, Ping? [22:45] awilkins: hi [22:46] Running into a problem pushing to a remote SVN repo - it looks like #394527 (with a slightly different message) [22:46] "bzr: ERROR: At least one property change failed; repository is unchanged " [22:47] It pushes about 8.5Mb and then coughs that up. The revision in question is not especially large but does rename a root level folder and nest it inside a new folder of the same name as the original [22:48] So foo => foo/new-foo [22:48] Alas, I have no access to the server logs or configuration, it's commercial SVN hosting [23:05] awilkins: not sure if there's much I can help with there :-/ [23:07] jelmer, Yeah, was just hoping for a miracle :-) [23:07] awilkins: I guess you could split up the commit so each change would be smaller [23:07] that might not be very easy though [23:07] jelmer, I have a feeling it's that one folder move, and all the paths inside being written as metadata in the revision properties [23:08] The rest of it is pretty small changes to text files [23:08] awilkins: that sounds about right [23:08] for the bug you linked [23:08] Yeah, I suppose I could ask if they'll raise that XML limit [23:09] I'm trying to find an SSH port I can hit it through to circumvent it [23:13] Bah, doesn't help that it's a horrible old build of CentOS in there [23:13] * fullermd upgrades pre-2a branches...