[00:00] hm ok. one more question. i commit a develtree. after that i create a new file and then i want revert to the last revision without all files created after the last commit. is this possible? [00:05] perhaps you want bzr uncommit [00:05] I'm not sure [00:07] but then the newly created files are still there [00:07] "bzr revert" instead? [00:07] no [00:08] so delete them? [00:08] or clean-tree [00:09] a great. that was i ve searched [00:15] i go sleep n8 === mnepton is now known as mneptok [01:47] lifeless: https://bugs.launchpad.net/bzr-search/+bug/480684 [01:47] Ubuntu bug 480684 in bzr-search "Return matching revisions" [Undecided,Incomplete] [02:06] Peng: your mirror branches broke launchpad :-) [02:06] (but it seems to be some network provider stupidity, not your fault) [02:06] RenatoSilva: I'm going out, but I have replied to the bug [02:09] lifeless: last 2 comments are mine [02:11] RenatoSilva: the last comment (#6) isn't [02:16] no idea of what this means: Nor does it have a suffix index (where you put rabedis and rabedis-on in an index and can then find both sidebar and no-sidebar efficiently). [02:17] lifeless: I would simply rename the bug to 'make bzr search human friendly', but that seems a big way to walk through [02:17] lifeless was going perhaps a bit too much into possible implementation details in those parens. [02:18] how to find no-sidebar? [02:20] If I'm understanding lifeless comment correctly, currently bzr-search only keeps a simple index that lets you look up complete words. [02:21] I don't understand why the bug is imcomplete, the title and description and comments are pretty clear [02:21] (i.e. it doesn't support searches by parts or words, or suffixes) [02:21] The problem is the scope of the bug is too large and nebulous to be useful as something to have on a todo list. [02:22] no it's not [02:22] *it's specific* [02:22] I think lifeless is asking for a bug, or bugs, with specific suggestions about how to improve the searching, rather than something as vague as e.g. "human friendly" [02:22] I just want to search the diffs, and know the revision [02:23] I didn't rename the bug to "make it human friendly" [02:23] So you want "diff-only search"? [02:23] I said that because of their comments about how imcomplete bzr-search is [02:24] well that's a very bad thing that bzr-search is in version 1.7 and can't even search partial words or whatever [02:25] I would keep the software as beta [02:25] spiv: well, as in the title, I just want "return matching revisions" [02:26] mwhudson: Awesome. How'd that happen? [02:26] return the revisions that match a search string, just like bzr search more or less does [02:26] Also, comment #4 is suggests you're looking for more complex forms of search queries than simple term-matching. [02:26] spiv: do you call bzr search Preferences a more complex search?? [02:26] same about no-sidebar [02:27] RenatoSilva: What does "matching" mean in "return matching revisions"? "word appears in the diff"? "substring appears in the diff and/or commit message"? [02:27] spiv: https://bugs.launchpad.net/bzr-search/+bug/480684/comments/2 [02:27] Ubuntu bug 480684 in bzr-search "Return matching revisions" [Undecided,Incomplete] [02:28] RenatoSilva: ok, so [02:28] RenatoSilva: I'm guessing a bit at what lifeless would like, but [02:28] RenatoSilva: I suggest changing this bug title to 'show the revisions whose diff contains the search string' [02:28] spiv: if you're lucky, your method is not called no-sidebar so you can use bzr-search for that but as I said there 1. no rev *number* 2. output is ugly [02:29] spiv: nice title, will change it now [02:29] RenatoSilva: and filing one or more other bugs for other enhancements like "find PreferencesProvider when I search for Preferences", etc. [02:29] RenatoSilva: I just copied it straight out of your comment #2! [02:32] Peng: connections from the data centre to bzr.mattnordorff.com are timing out [02:33] ah ok :) just changed, for the other bugs, I think I'm only able to say 'make it human friendly', which would probably be rejected for being too general (looks more like a blueprint). You guys, however, are more experienced on how it works and all the specific terms like stemming (?), so you can more easily split it into more specific tasks in my opinion [02:35] "return PreferencesProvider when I search for Preferences" is more like a use case than a proper bug description for me (imagine one writing if s == 'Preferences': return 'PreferencesProvider', or some similar hack :D ) [02:36] RenatoSilva: well, don't worry about specific jargon [02:36] RenatoSilva: give specific examples of things you'd like to work better [02:36] ok [02:36] thanks for helping [02:36] RenatoSilva: i.e. a bug report that is a use case that doesn't work yet is still a reasonable bug report, so long as the use case isn't too general [02:36] RenatoSilva: i.e. don't file bug 1 ;) [02:36] https://bugs.launchpad.net/ubuntu/+bug/1 (Timeout) [02:36] (That was a quick timeout!) [02:37] spiv: would be nice if you later convince lifeless that the bug is not incomplete [02:37] (because it seem you got me) [02:37] RenatoSilva: lifeless may still prefer to split some of those bugs into more specific bugs, or mark some as duplicates of others, but that will be easier to do the more specific they are [02:38] I mean this open bug, its status is incomlete but it's just that lifeless didn't get me in my opinion [02:38] * imcomplete [02:39] RenatoSilva: well, I'd guess with the new title he'll be satisfied, but ask him [02:39] RenatoSilva: right, I agree, but that's actually a reasonable use of incomplete [02:39] ok ok, it's because you have more weight in convincing him I suppose :) [02:39] RenatoSilva: perhaps, I wouldn't be too sure ;) [02:40] I'll tell him that you think it's ok, ok? [02:40] Well, you can tell him it's now close to I think he thinks it should be ;) [02:41] don'tget you, but big thanks anyway! [02:41] It's his project, I don't have any special authority over it or him. I *do* have some experience in understanding what he finds useful in a bug report, though. [02:42] (Which isn't far off what I find useful) [02:42] ok ok thanks, gtg good night! [02:45] RenatoSilva: good night [03:01] So I have a local (unbound) bzr branch, and I want to merge a change from a branch on launchpad. I tried doing 'bzr merge lp:~ubuntu-minnesota/ubuntu-drupal-theme/minnesota-patches' and got this: [03:01] "bzr: ERROR: KnitPackRepository('file:///home/drupal/sites6/ubuntu-minnesota.org/themes/ubuntu-drupal-theme/.bzr/repository/'); is not compatible with; RemoteRepository(bzr+ssh://bazaar.launchpad.net/~ubuntu-minnesota/ubuntu-drupal-theme/minnesota-patches/.bzr/); different rich-root support" [03:02] Your local branch is in an old format [03:02] Assuming you have bzr 2.0 or newer, just run "bzr upgrade" in that branch [03:03] mwhudson: Ehh. That's not my fault, is it? [03:04] spiv: ah, perfect - thanks [03:04] mwhudson: FWIW, mtr to crowberry (bazaar.lp) and druzhnaya (puller) from my end work fine. Well, 1 packet gets dropped at the last hop, but that shouldn't matter. [03:09] tonyyarusso: you're welcome [03:10] hmm, now I have a message that there's a conflict in a file - is there a way to show what the actual conflicting text is? (I only have a filename so far) [03:10] the man page makes it sound like showing the text should be the default [03:12] oh, I see [03:12] .BASE and .THIS [03:14] Peng: maybe it's better now anyway, not your fault [03:15] tonyyarusso: and look at the file itself [03:15] tonyyarusso: the conflicting region(s) will have markers like <<<<<<< ======= >>>>>>> in it. [03:16] er, s/in it/around it/ [03:16] oooh, ok [03:17] mwhudson: I hit the "Try again" button on one branch -- let's see if it works. [03:18] spiv: um, by "the file itself", do you actually mean one with .~1~ appended to the name? [03:19] mwhudson: The puller did hit my server, but LP still reports an error. (https://code.edge.launchpad.net/~mnordhoff/loggerhead/cheezum) [03:20] tonyyarusso: the file that has the conflict, usually [03:20] tonyyarusso: unless you have a conflict where both sides added a file of the same name. (More common is both sides modified the same file that already existed) [03:20] Peng: hmm [03:22] spiv: well, the issue is the file with the conflict is listed as 'style.css', but that doesn't appear to exist right now. I have a style.css.~1~, style.css.20100204 (a separate backup I made a few days ago manually), style.css.BASE, style.css.orig (I'm not sure about that one), and style.css.THIS [03:22] only .BASE and .THIS have file modification times of today. [03:27] tonyyarusso: ok, I'd guess you have the more complex kind of conflict, i.e. that both sides added (or renamed) different files to have the name 'style.css', or something like that. [03:27] tonyyarusso: pastebin the output of "bzr conflicts"? [03:27] And "bzr st"? [03:27] no need for pastebin on the former - it's one line: /home/drupal/sites6/ubuntu-minnesota.org/themes/ubuntu-drupal-theme [03:29] the latter has "renamed: style.css => style.css.THIS; added: css/style.css; unknown: style.css.BASE" [03:29] tonyyarusso: "bzr conflicts" just shows a filename, not "Text conflict in $filename"? [03:30] spiv: bah, bad copy-paste. "Contents conflict in style.css [03:31] tonyyarusso: ok, IIRC this is because one side has modified the file (yours probably judging by what you've said), but the other has deleted it [03:32] spiv: Yes, I have modified that file manually. So most likely, upstream tried to move style.css to css/style.css, and got confused b/c I had modified something it wants to delete, right? [03:32] tonyyarusso: I suspect from the "bzr st" output that someone might have accidentally deleted it and then added it again (as a new file) to rename/move it [03:32] tonyyarusso: exactly! :) [03:32] hrm, ok [03:33] tonyyarusso: so the resolution is mostly likely to either apply your changes to the new file, or revert the deletion, and move your file to the new location... [03:33] tonyyarusso: ...and tell whoever made that change to use "bzr mv" next time, or even "bzr mv --auto". [04:25] Man, “git add -i” makes me *long* for bzr shelve. What the hell are you supposed to do with this prompt: “Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]?” [04:26] you want magit [04:32] Ah, no. Actually I wanted “git add -p”. [07:20] hi all ! [07:28] рунф мшдф!!! [07:28] heya vila!!! [07:28] :D [08:09] lifeless: ping [08:10] chx: hi. Is this re: the mail you sent me? I've replied. [08:10] lifeless: yes. i saw. :) [08:11] lifeless: just wanted to ask whether you want me to collect the more interesting points or you guys will read the (rahter interesting) thread [08:15] I'm not sure at this point [08:15] I'm hoping jam or someone will volunteer to be a resource for you [08:16] in my experience its best to have someone like yourself or emma as a primary advocate though [08:16] for now, until I hear back, I suggest mailing anything specific that is a concern/needs more info to the main bazaar mailing list [08:18] I will do that , OK [08:18] And we are advocating -- David Strauss and myself, I will get hold on Emma once she is bakc from NZ [08:32] chx: excellent [08:32] chx: battle for drupal? [08:33] bialix: yes [08:33] gimme a link please [08:33] http://groups.drupal.org/node/48818 [08:33] I WANNA BE AN ELF-WARRIOR WITH A +3 BOW OF PHP! [08:34] wait ... does PHP allow +? [08:34] the discussion so far is suprisingly sober [08:35] mneptok: Of course. It may even mean what you want it to. [08:35] or may not [08:35] :p [08:35] Doesn't Drupal still have a semi-active bzr mirror around from $YEARS ago when jblack was talking to them? [08:35] i write phpwtf.org so you dont need to tell me that php is weird [08:36] fullermd: we have a launchpad mirror which i use. [08:36] fullermd: thanks god [08:36] vila: finally got around to finishing and sending that email to the bzr list. Sorry it took so long. [08:36] ohcrap. [08:37] i just put on a Ring Of Power and now register_globals is enabled. [08:37] THE EYE CAN SEE ME! [08:37] quicksilver: great, thanks [08:37] * fullermd writes it for a living; no secret here either :p [08:37] fullermd: it would have been better to move to bzr in 2006 yes but it did not happen alas. We are a lot bigger so it might be a bit harder but it's also our growth that made CVS unbearable. And let's face it, these last four years made bzr a lot better too. [08:39] mneptok: i already told you that you do not need to bash PHP to me. I can do it a hell lot better and evne do it on a blog as mentiond. And register_globals is gone for good for one, two, Drupal worked around it for years and now simply refuses to run if it is on... [08:41] mneptok: i came here for help and not (the rather boring and tiring) PHP bashing. There is more to picking a system than the language it is written in. [08:41] uh. wow. easy there, tiger. i'm not "bashing" PHP. i'm not bashing Drupal. i'm trying to make people smile a little. [08:42] mneptok: you failed :D [08:42] vila: apparently not. ^^ [08:42] As I *try* to teach my daughters, humour is a risky job, sometimes you had to assume the consequences, bear with it and keep bashing :D [08:43] mneptok: I was meta-smiling :D [08:43] vila: woot! meta-success! [08:43] LOL === gerard_away is now known as gerard_ [08:44] morning [08:44] chx: you're preaching the chore, we're all using bzr.... [08:44] hi gerard_ [08:45] Humor == brute force? If it doesn't work, you're not using enough? [08:45] vila: yes I do. But there are a couple thousand Drupal developers who dont. [08:45] fullermd: heh [08:45] vila: we have an excellent chance to change that. [08:45] chx: I was referring to "There is more to picking a system..." :D [08:46] chx: I agree with lifeless, things work better when some ambassadors act as gateways, we have limited resources so focusing on ambassadors's summaries is the most effective way to help [08:48] chx: if there are bugs that are more important to the drupal community, flag them as such (affects-drupal or something) [08:48] hm, then i need to check whether there is a bug for friendlier unshelve [08:48] chx: if you need help setting up some central server, ask here [08:49] oh infra knowledge we have aplenty :) [08:49] chx: you know about 'bzr unshelve --preview' right ? [08:49] chx: yeah, silly me :D [08:49] chx: GNOME went through similar machinations not long ago. although outdated, this might provide some useful info and topic points - http://live.gnome.org/DistributedSCM [08:50] last i checked (which was this year) you could only specify a numeric id for unshelve [08:50] and not the message [08:50] let me retest so i can speak more coherently :) [08:50] that's how it seemed to me when I chcked out unshelve just a few weeks ago [08:50] that sounds like a really easy one to fix, too :) [08:51] wise words, vila, about your daughter. [08:52] vila: bzr: ERROR: no such option: --preview [08:52] bialix: two daughters even :D lunches and dinners are more and more... interesting :D [08:52] chx: upgrade ! :D [08:52] * bialix was bitten in the past for not looking forward before start joking on risky themes :-/ [08:52] chx: let me check [08:52] vila: w00t! [08:52] No packages will be installed, upgraded, or removed. [08:53] i am on 2.0.2 [08:53] chx: unshelve --preview is in 2.1 [08:53] "let's poke fun at $LANGUAGE" in an IRC dev channel is not risky. it's a hard requirement. ;) [08:53] and what does it do? shows the patch to be applied? [08:53] yep [08:53] chx: revno 4955 so yes, part of 2.1 [08:54] but it fails for me yesterday with non-ascii [08:54] chx: it shows the corresponding diff [08:54] mneptok: klingon! [08:54] mneptok: Pfft. That sounds like something a COBOL programmer would say... [08:54] vila: choir [08:54] vila: chores are boring tasks ;) [08:54] lifeless: it's like hhtps, it's too late now, I will take the one for the other for years to come ;D [08:55] lifeless: Hab SoSlI' Quch! [08:55] lifeless: I was so sure to get it right this time... [08:55] :-D [08:55] fullermd: join the curch of cobol now for final salvation [08:55] ooo, hhtps! that's cool [08:56] * fullermd has been dreaming of cobol's "final salvation" ever since he had to learn it... [08:56] COBOL got the boring printed report descriptions right, I've never since better since then.... [08:56] COBOL's final salvation is the banking industry. [08:57] mneptok: in lucid, you can enable it ;) [08:57] mneptok: yeah, that's what I just said no ? [08:57] oh ffs - im still in #cobol [08:57] ronny: yeah ! Don't you love putting 'D' in column 7 ? [08:57] lol, every few dats someone got in and declared cobol dead [08:58] and a few weeks ago i explained the religion of cobol to someone [08:58] ronny: and how about: Error: '.' is missing [08:58] ronny: idle : 6335 days 4 hours 44 mins 30 secs [signon: Jan 31 00:00:00 1969] [08:58] damn, i must have been drunk to get such an idea [08:58] mneptok: lol [08:59] err, wait, let's stop bashing COBOL, chx is still around [08:59] bah [08:59] . o 0 (Will chx smile on this one ?) [08:59] cobol aint that bad, its a pretty good worst case example [08:59] . o 0 (Darn, missed again) [08:59] i apparently have a humour detector fail :) [09:00] \o/ [09:00] ronny: stop ! stop ! someone will try to find worst ! [09:00] chx: dude, i have like 10 ex-girlfriends that would LOVE you. [09:00] ;) [09:00] At once? That sounds hazardous. [09:01] not really. just expensive. [09:01] vila: once someone explained to me how to sort a words file in just as little 100 loc of cobol [09:01] . o 0 (girlfriends load test harness... worst a try ?) [09:01] worse, damn [09:01] "worth" [09:02] no, worth, or something [09:02] *patpat* [09:02] on reflexion worst wasn't such a bad joke :D [09:02] Yeah, I thought it rather apropos. [09:13] hi [09:13] i want to hold a single file and revert all other files two reversions back [09:14] cp file SAFE; bzr revert; cp SAFE file ? [09:14] rm SAFE [09:15] exs: bzr shelve/unshelve *may* work too [09:16] ok will tryin [09:16] thx [09:18] exs: qrevert [09:19] err, no [09:19] qrevert can't do two revisions back [09:19] ok i do not use kde [09:19] bad bad qrevert [09:19] exs: people on gnome using it too, I guess [09:20] bialix: maybe but i like the commandline more [09:21] no problem. [09:21] * bialix also likes command line [09:23] also i want just to become better in bzr so i asked the question in the hope to learn more and new methods working with bzr [09:30] * gerard_ loves lighweight checkouts :) [09:30] I'm switching around git style [09:33] and how to unignore certain files? ivh not found any commands for this issue [09:33] edit .bzrignore [09:33] can i simply delete this file? [09:34] A lot depends on exactly what you mean by "unignore"... [09:34] you almost certainly don't want to delete it [09:35] i vh ignored only two files and after i delteded it and commited there was a line informed me that the .bzignore is missing. is this very worse? [09:48] gerard_: colo ftw! [09:57] Hi. I was trying to send bugfix to bzr through launchpad. More information here https://code.launchpad.net/~junak-michal/bzr/giveback/+merge/18297. I was advised to send an email for accepting contributor agreement so i did it (from the mail I use as launchpad login). I want to ask if I should do something else or if it is okay now. Sorry for stupid question, but I am kind of confused. [10:11] junak-michal: that sounds fine to me [10:11] junak-michal: (thanks!) [10:30] one more question. what does revert --no-backup does? which backups are means? [10:30] junak-michal: oh, and if for some reason there's more required, a developer will let you know. Reviews and the like don't always happen immediately, but we mostly manage within a day or two. [10:31] exs: see "bzr help revert": [10:31] By default, any files that have been manually changed will be backed up [10:31] first. (Files changed only by merge are not backed up.) Backup files have [10:31] '.~#~' appended to their name, where # is a number. [10:31] i dont see any # files in my directory [10:32] exs: it would be FILENAME.~1~ [10:32] not literally # [10:32] ah ok [10:32] thx [10:32] (or FILENAME.~2~, etc) [10:33] can you answer me one more question. which advantages i get if i use init-repo? [10:34] Space savings by sharing history among branches. [10:34] the branches inside the repo will share that repo, which means only one copy of revision data. That saves space (and time when creating and deleting branches) [10:35] that means there are no more commands or feature i can use if i have a repo inited, but the .bzr directories are more organized and work faster? [10:36] exs: right [10:36] ok thx. i have in one directory an inited dir without a repo. but i want to do the repo to the parent direcory. can i do it simply? [10:36] so the repo accept the inited dir? [10:36] Yes. With the exception of a few dark edge cases, everything should act exactly the same. Just faster. [10:37] exs: you should be able to init-repo the parent, then "bzr reconfigure --use-shared" in the branch [10:37] You can init-repo to create the repo, and then use reconfigure (--use-shared I think) to change that existing branch to use the now-present repo. [10:37] * fullermd gives up and lets spiv do the typing :p [10:39] Actually, I'm about to go to bed, but thanks :P [10:39] Bed? Nonsense. The sun isn't even up yet. [10:40] spiv: thanks:-) [10:54] and how to rename a branch? [10:55] just bzr mv bla blanew? [10:55] exs, rename a branch? [10:55] you can just rename the directory [11:00] can i mv the repo after init? [11:01] for example bzr init-repo bla and then mv bla to subdir/bla? [11:01] exs, yes, as long as you take the .bzr dir with you, it's all good [11:01] exs: so long as the branches are still subdirectories of the repo, sure [11:01] * spiv -> bed [11:01] ok thx [11:12] lol [11:13] hello (this is in relation to launchpad project). - im getting an error about being unable to lock a file when i try to push, i've used the brek-lock but it gives the same lock error when i try push again. anyone know an easy way out of this mess ? [11:13] break-lock* [11:15] i should mention its only me using the repo. - i lost net connection during a push which caused this. [11:25] Lamba: hmm, the simplest way may be to just delete the branch on launchpad [11:29] ive just this second fixed it... - apparently break-lock bzr+ssh & break-lock sftp dont actually break the lock. - i did break-lock lp:~username and bingo. [11:30] bit confusing because bzr's error message says to uzr bzr+ssh, but hey ho :) - least i know now [11:30] use* [11:31] Lamba: hmm, as long as 'lp~username/...' aliases to the same branch, that's equivalent :D [11:32] yea, odd thing was the bzr+ssh and sftp ones didnt ask for a y/n response, just dropped back to prompt. oddness. [11:42] Lamba: then it may mean there wasn't a lock there to break... [11:42] ach, he's gone :-/ === radoe_ is now known as radoe === mrevell is now known as mrevell-lunch === mrevell-lunch is now known as mrevell [14:02] Hello [14:04] hello [14:07] The bzr version in the beta ppa is out of date (it has 2.0.1) - I'm going to have a shot at updateing it. [14:17] Err - I guess if I do that, I also need to do all the plugins to. :( [14:29] jam: The list that you had in this mail: http://www.mail-archive.com/bzr-windows@lists.launchpad.net/msg00274.html [14:29] Is there an update version. [14:30] GaryvdM: you can just look at lp:bzr-windows-installers or lp:~bzr/bzr-windows-installers/2.0, the file tools/win32/buildout.cfg has the list of files and versions [14:30] off-hand, there is a newer qbzr, bzr-explorer and bzr-xmloutput [14:30] Ah - cool [14:31] Thanks === salgado is now known as salgado-lunch [15:29] * quicksilver utters a long and ugly ancient egyption curse at mailman's ridiculous default settings, and chases his preferences on yet another mailman installation. [16:18] evening GaryvdM! [16:18] nice to see you here [16:18] Hi bialix [16:19] I'm busy trying to get the beta ppa up to date... [16:19] igc: ping [16:22] GaryvdM: should we CC announcement mails about qbzr releases to debian maintainers? [16:24] Maybe. I think that they have tools to do that automatically. See http://qa.debian.org/developer.php?login=pkg-bazaar-maint@lists.alioth.debian.org [16:24] hmm, is dpush part of bzr core, or something like rebase? [16:25] jelmer: ^ [16:25] And http://dehs.alioth.debian.org/report.php?package=qbzr [16:26] bialix, GaryvdM: I'll leave updating up to Stefano [16:27] hi jelmer, Tak asked about dpush [16:27] Tak, it is in core [16:27] Hi jelmer [16:28] Tak, ('bzr help commands' will tell you what plugin a command lives in) [16:28] cool, we're now pstream [16:28] cool, we're now upstream [16:28] yeah, I forgot about hidden-commands [16:30] bialix: In the debian package is a watch file, which is configured to check our downloads page. [16:30] great [16:34] * Tak #519382 [16:40] bug 519382? [16:40] Launchpad bug 519382 in bzr "dpush reverts added files" [Undecided,New] https://launchpad.net/bugs/519382 === salgado-lunch is now known as salgado [17:18] jam: got some time to continue reviewing my changes to update? === gerard_ is now known as windows_people === windows_people is now known as gerard_ [18:32] gerard_: done, in case you didn't see the update [18:33] jam: thx, didn't see it yet ;) [18:33] vila, poolie: did you see any update about Junak signing the contributor agreement? [18:46] jam: EODed but, Junak was here a couple of hours ago, I missed him but he sounded like he sent the mail for the agreement, so it should be somewhere in the pipes... [18:46] vila: I'll have to take control of your machines then... :) [18:46] thanks for checing [18:46] checking [18:46] Sort of makes me wish LP had a "blocked on X" status [18:47] Having to read the mp comments to determine that is a pain [18:47] I suppose even just a "Whiteboard" for merge proposals might suffice [18:50] hi vila [18:50] jam, in https://code.edge.launchpad.net/~abentley/bzr/lpsubmit/+merge/18876 i think you should have picked up on the lack of docs too [18:51] poolie: enjoying early wake-ups when coming from Europe ? :-/ :-) [18:52] :/ [18:52] jam: a whiteboard sounds like a good idea [18:52] poolie: :-( [18:52] poolie: I half hoped I was wrong :-/ [18:52] poolie: it just makes you a morning person, able to get done before lunch what most people take all day to accomplish [18:53] poolie, you say "It looks like [lp-submit] creates a merge proposal or requests a merge - that's what the Launchpad UI calls it but this seems to have no connection." What do you mean? [18:53] does this create a merge proposal? [18:53] poolie, yes. [18:53] but the term 'merge proposal' doesn't occur anywhere in its ui [18:53] or help [18:53] abentley: I guess that since it wasn't obvious to poolie, it could use some further explanation in the doc string [18:54] poolie, I'll add that. [18:57] * gerard_ is looking for a second reviewer for https://code.launchpad.net/~gerard-/bzr/update/+merge/18464 [18:57] it's about the coolest merge proposal ever [18:57] or maybe not [18:57] i'm happy to have it [18:57] only one way to find out ;) [18:58] hi gerard_ [18:58] i think it would be good [18:58] i'll try to get to it later [18:58] hey poolie [18:59] though i think vila is meant to be ppa this week still [18:59] poolie, gerard_ : I plan to do it tomorrow morning first thing, I only saw jam's review some minutes ago [19:00] i have some more things to put into the queue from my flight [19:00] err, tomorrow morning my TZ so, in ~12 hours [19:01] vila: that's morning for me too ;) [19:01] gerard_: ok :D [19:03] our patch queue is getting long again [19:03] kind of good in a way [19:03] but you can have too much :) [19:06] poolie: not too much from non-core though and I hope to reduce it before Friday :D [19:07] poolie: did you get a mail from Junak for the contributor agreement ? [19:07] poolie: He was here a couple of hours ago, I missed him but he sounded like he sent the mail for the agreement, so it should be somewhere in the pipes... [19:10] the contributor agreement looks kinda scary I must admit [19:11] lots of open source projects ask for copyright assignment, but most are really informal about it [19:42] gerard_, kfogel and i are working with our lawyers on it [19:42] in fact he just sent me a new draft faq [19:42] so any further comments are welcome [19:45] I would also mention that most open source projects aren't backed by something worth suing :) [19:45] I don't like point 5 and the "other license terms" of point 6 [19:45] jam: yeah, you've got a point there [19:50]