[07:17] JPeterson: git merge = bzr merge; bzr commit [08:32] hey, it's been a long, long time since I submitted something to bzr. How do I land a patch to bzr? [08:32] I'm not sure if I've got commit privs, [08:33] but poolie gave me the go-ahead for https://code.launchpad.net/~jml/bzr/rubberstamp/+merge/130850 [08:36] but when I pqm-submit, I'm told it can't verify my gpg kkey [08:54] jml: the normal way is lp:hydrazine `./feed-pqm bzr` [08:55] mgz: ok. [08:55] wow, hydrazine, huh? [08:56] and you then 'n' till your proposal, 'm' set the message, and 'e' gpg sign and email for pqm to land [08:57] mgz: ok, thanks. [08:58] mgz: unfortunately, I have to step away for a bit now, but is it OK if I ping you later if I have trouble landing this? [08:59] jml: certainly [08:59] mgz: ta [08:59] I'll be around to be completely unhelpful too, if that'll help. [09:01] fullermd: I was going to say "possibly", but I'm not sure that's strictly true. I appreciate the gesture though. [09:02] Oh, well, you can just lie to me about it. I do it to me all the time, and I never seem to catch on. [10:14] fullermd: I'm just not sure it's logically possible for being completely unhelpful to ever help. [10:16] Pfft, logic. What has logic ever done for me? [10:22] mgz: does hydrazine just loop? [10:22] mgz: also, it looks like I'm not a committer. [10:23] mgz: so maybe I should just ask you to merge https://code.launchpad.net/~jml/bzr/rubberstamp/+merge/130850 [10:23] yes, blast, and okay. [10:24] mgz: thanks :) [10:26] ah, and your branch needs to be marked approved, which is why it doesn't appear in the list [10:26] so, pqm may in fact allow you to land it [10:27] want to give it a go? if you get rejected, I'll do it. [10:30] mgz: sure, I'll try now. [10:30] PQMException: 'Failed to verify signature: gpgv exited with error code 2' [10:30] mgz: ^, I think you need to do it. [10:31] Maybe pqm forgot how to commit to bzr... [10:31] I shall capture a webop later and get you added, landing now. [11:24] hi! [11:24] is it possible to rename a branch in launchpad? [11:25] I would like something like: lp:~ybailen/canonical-openerp/employee-registry-payroll -> lp:~ybailen/canonical-openerp/canonical-payroll [11:25] keeping the versioning [11:25] but I'm not sure if this is possible [11:26] yaiza: Yes, click "Change branch details" on the Launchpad page. [11:26] * yaiza tries [11:33] hmm, if I choose Target branch as Personal I get this error "Only private teams may have personal private branches." [11:46] jpds^ ? [11:48] yaiza: But you only want to change "Name". [11:49] jpds, if I leave Branch Target as it was: canonical-openerp then I get this error: "Private branches are not allowed for target Canonical OpenERP." [11:49] so I tried to change that [11:49] with no success :( [12:02] yaiza: you can ask for help in #launchpad if you're stuck [12:03] ok mgz, thanks [12:53] How do I add --no-trees flag to an existing shared repository? Just noticed I forgot specifying it when creating a shared repository some time ago. [12:55] I know how to drop the working trees from it's branches. But like the flag to be recorded so bzr branch remembers to do the "right" think when branching. [12:56] hno: There's an arg to 'reconfigure' for it. [12:57] fullermd, thanks! [13:06] To rusty on bzr merges. Need to backport a working branch to an older branch point. Is there an easier way than to cherry pick each revision listed by bzr missing? [13:07] Mmph. Well, if your looking at "cherry pick _each_ rev", the answer would just be to do a merge. But since you're asking, I presume you're wanting to actually skip some... [13:07] You can do a merge -rX..Y to grab just a range. It would still be a cherry pick if the graph isn't connected, but it would at least get you N at a time instead of 1. [13:08] Though that's a drawback too, in that it mushes more things together and gives you more chances for big conflicts. [13:08] fullermd, the working branch is based on trunk, and need the same changes based on a release, skipping all the changes between the release and current trunk. [13:16] Do "bzr merge -r branch:../trunk..-1 ../trunk-feature-branch" look sane? [13:16] Not at all 8-} [13:17] Any saner suggestion? [13:17] It may be _correct_, of course. [13:17] At a glance it _looks_ like it's asking for what you described, so it may be right. [13:17] Does twist the eyes a bit though. [13:19] "bzr merge -r submit:..-1 ../trunk-feature-branch" is probably better. [13:23] "bzr merge -r submit:.. ../trunk-feature-branch" works as well, but not sure it's documented that one do not need to specfy the last revision in the range. [13:23] It is. [13:24] where? [13:24] No idea :) [13:24] But it is an explicit feature, and I know it's in the test suite. [13:42] Hm.. that merge for some reason set my submit branch to the trunk-feature-branch. Not what I intendend. [13:53] merge will always set the submit branch if it isn't already. [14:07] and branch don't.. [14:10] In which use case do merge implicit --remember if unset produce a meaningful result? To me it's only confusing. [14:19] hno: all cases where there is only ever one branch you want to merge from [14:20] hno: like merging trunk into feature branches [14:20] hno: meaningful, but still can be confusing (re: list discussions about this) [14:23] LarstiQ, in those cases parent is also trunk and separate submit location is not needed. [14:26] ah hmm, submit [14:26] Yes, but merge uses a separate saved location. [14:26] it uses parent is submit is not set. [14:26] Right. [14:28] hno: in the cases where it makes sense to submit to the location you merged from then :) [14:29] but it becomes less obviously the right choice I think [14:31] there is a --remember flag for the odd cases needing it.. [14:39] hno: on the other hand, when do you want submit to be something different without setting it explicitly?? [14:40] argh [14:40] s/?// [14:47] LarstiQ, exactly. I do not want merge to set the submit branch for me when doing a random merge from some other branch. [14:47] when otherwise only using parent. [14:48] right [14:48] does anything using submit fall back to parent if submit is not set? [14:49] that would be rather annoying [14:49] LarstiQ, yes. [14:49] bzr merge, and also submit: revision spec in general so also bzr diff etc. [14:58] hno: right, so how to balance [14:58] * LarstiQ would (now) lean towards not setting it automatically [14:59] Yes. Unless there is some very common use case which I fail to see where it makes sense. [15:25] Available evidence (it's there, and hasn't been a major cause of complaint in the last N years) suggests it does OK in the common case. [15:25] The whole arena has certainly been the cause of plenty of acrimony in the past. === yofel_ is now known as yofel