[00:00] mgrandi: argh.. I think I see what happened [00:00] oh? [00:01] did addpatch add a bunch of files? [00:02] bzr lp-propose automaticalle selected lp:ubuntu/compiz as the branch to merge with. That is the branch where the development takes place. lp:compiz is where the merge should happen (it only contains the debian directory) [00:03] ah yeah [00:03] it did seem like there were a bunch of files that were present and got added [00:04] because the branches diverged [00:04] so what is lp:compiz then if dev happens at ubuntu/compiz [00:04] upstream development ought to be in lp:compiz [00:04] well [00:04] that ought to be a mirror, i suppose [00:05] ah makes sense [00:05] https://code.launchpad.net/~compiz/compiz/ubuntu [00:05] so yeah, just change the merge proposal dest and you should be good [00:05] this branch is listed in debian/control under the Vcs-Bzr tag [00:06] hmm [00:07] im not too familiar with how lp-propose works [00:07] but poolie can help hehe! [00:07] i have to go, gl [00:13] poolie: so what do I have to enter as the target branch if I want the above to be the target branch? [00:15] When I try to propose my branch to be merged back into lp:compiz I get "This branch is not mergeable into lp:compiz." [00:29] okay.. this looks better https://code.launchpad.net/~mniess/ubuntu/precise/compiz/fix-screenshot/+merge/100539 [07:03] hi all [08:23] morning [08:24] ok look, its wgz renamed :P [08:27] He's not renamed, he's just on the other side of the world from you, so he looks upside-down. === quicksil1er is now known as quicksilver [08:37] we are certainly each other's evil twin [08:49] That's just the sort of thing an evil twin would WANT us to believe. [09:37] spiv: https://code.launchpad.net/~spiv/ubuntu/lucid/paramiko/address-families-579530-lucid/+merge/25297 [09:37] spiv: perhaps that needs a 'delete' button clicked on it or something. I imagine its still in your activereviews list [10:34] mgz, vila: are we hanging out now? [10:34] jelmer: waiting for poolie ? [10:35] jelmer: that's the general plan [10:37] hi all [10:37] hi.. [10:37] h... [10:37] hi poolie [10:40] hi [10:40] am i here? [10:40] poolie_: hi [10:57] how can I eliminate this warning? 2012-04-03 10:57:12,217 - udd.scripts.mass_import - WARNING - Error accessing max threads file /srv/package-import.canonical.com/new/max_threads: [Errno 2] No such file or directory: u'/srv/package-import.canonical.com/new/max_threads' [11:46] jml, hi, does the file exist? [11:47] poolie_: no. when I create it empty the error goes away. useful error huh? [12:11] :/ [12:11] it's a bit hardcoded [12:11] whack james === yofel_ is now known as yofel === Quintasan_ is now known as Quintasan [14:59] Hi, I am looking for the automv plugin, but it seems gone [15:00] http://bzr.oxygene.sk/bzr-plugins/automv/ <-- empty [15:00] ErwinM: it's now in bzr core I think [15:00] ErwinM: "bzr mv --auto" [15:00] Aha, thanks [15:01] Yes, that worked just fine. :-) [15:02] jml: echo 5 > /..../max_threads ? [15:03] I believe it does a live check to allow you to turn up and down the number of running threads [15:03] (udd uses it to lower throughput when LP is under high load) [15:03] I think warning is probably useful for UDD, since it indicates a configuration error. [15:04] Not as useful for your project, though. [15:04] anyway, EOD here, have a good evening to all. [15:04] jam: it runs when the file is empty [15:04] jam: so it's a bogus warning. [15:04] jml: well, I'm sure there is a default num threads. [15:04] But not having the file would be a misconfiguration for UDD [15:04] pha [15:05] jml: I can see your point, it is just a "how generic is this code" issue. It isn't super-duper useful for UDD [15:05] other than if we set a value and it doesn't take [15:05] a warning helps understand if we accidentally have the file owned as "root" for example === lool- is now known as lool === deryck is now known as deryck[lunch] [16:51] Hey, I've got would like to make patch using diff of a revision range A..B but excluding the rev XXX, how can I do this ? [16:51] I would like* [16:52] I would... make a new branch -r B, merge -rXXX...(XXX-1), and diff -rA.. [16:53] Hum good idea, I'll try, thank you [16:59] Erf, I tried to remove a colo-branch with bzr rmbranch and know my depo is unusable... [17:00] I had no pushed commits... [17:00] bzr: ERROR: No repository present: "file:///home/thibaut/OpenERP%206/OpenAssur/addons-opas/" [17:00] Seriously, I lost everything ? [17:01] hm, and I'm not sure the fix for bug 922953 has been landed on 2.5 [17:01] Launchpad bug 922953 in Bazaar "rmbranch should refuse removing active branch" [Medium,Fix released] https://launchpad.net/bugs/922953 [17:02] I used bzr rmbranch mycolobranch [17:02] How can I fix that mgz ? I had work I didn't pushed, is it lost ? [17:02] welcome to the git way of working, I guess... [17:02] am checking to see if pre-fix there was a way of recovering or not [17:03] I don't understand why it removed my trunk branch wheras I told him to remove a colo branch Oo [17:04] see also bug 920653 [17:04] Launchpad bug 920653 in Bazaar ""bzr rmbranch" doesn't handle colocated branches" [Medium,Fix released] https://launchpad.net/bugs/920653 [17:05] ... [17:06] Here, I don't even have a branch, brz branches prints nothing... [17:06] I did recover from doing various daft things with colo, but don't recall which issue was which [17:06] jelmer: any suggestions? === deryck[lunch] is now known as deryck [17:08] or vila maybe ? [17:09] Please tell me I'll be able to push my last 2 hours work I just commited before doing this :D [17:11] there's always the filesystem recovery tool route [17:12] At least it didn't removed the files... [17:13] just the repo and branch metadata, not the tree, right? [17:13] comma after repo. [17:13] Yep I guess, I've got a .bzr dir and my files are still there [17:14] So, I've got to call my boss est tell him why I can't push the things we were supposed to put in production tonight (I was making a patch for this) [17:14] but no repository/ or branch/ inside, right? [17:14] branch branches branch-format branch-lock checkout README [17:14] In .bzr [17:16] Merwin_: so, you have your actual changes, so this isn't a complete disaster [17:16] can either branch from previous location, copy tree across and commit for now [17:17] or.. it was a fresh project? recreate and copy tree, add and commit [17:17] I can't commit [17:17] in that branch. [17:17] you can make a new one. [17:17] Hum [17:17] which unblocks you for tonight. [17:17] I try [17:18] Don't seems to work: bzr branch actual_dir new_dir [17:18] Same error: bzr: ERROR: No repository present: "file:///home/thibaut/OpenERP%206/OpenAssur/addons-opas/" [17:18] Merwin_: so, did you create this from scratch 2 hours ago, or branch from an origin? [17:19] Nope, it's a long time branch I used for weeks [17:19] but you have no other version of the same base project anywhere? [17:19] Yes, on our dev server [17:20] Where I regulary push [17:20] okay, so branch from that. [17:20] But I won't have the last commit I made in my branch (the one I did't pushed yet) [17:20] then copy in your changes from today, and do one big commit. [17:21] Ok [17:21] you lose any little commits you did along the way, but the changes are still there. [17:21] and +affectsmetoo that bug I linked :) [17:21] That's enought for tonight [17:22] I did it thank you. It's a hudge repo, it's downloading I keep you informed :) [17:23] :) [17:30] mgz, while it's downloading, could you tell me how I'm supposed to remove a colo-branch ? [17:30] that would be the way, it's just buggy in 2.5.0 [17:31] it should be roughly equivalent to removing the dir .bzr/branches/NAME though [17:31] ok... [17:37] not your fault, basically [17:39] mgz, merge -r 552.1.1...X => What should I put at X? [17:39] I want to undo the commit 552.1.1 [17:40] 552 [17:40] Looking at qlog, it seems that its 'ancestor' is 552. [17:40] Ok [17:40] it's easy in that case, .1 follows from the without-dot form always [17:42] Hum, my patch contains binary files that I want to have [17:42] It doesn't seems to handle binary files (OpenOffice .sxw, models for generating PDF) [17:43] I'll have to add them manually ? [17:44] you mean the textual patch only says "binary file added" but you want to be able to apply it and have the files added? [17:44] Yes, exactly :) [17:45] I don't have a lot I can push them via SFTP, it's not a problem, I'm just curious if there is a way to handle this [17:46] you can just use a different diff format I think. === CardinalFang is now known as qengho [19:11] hey jelmer if you are there, i remember you saying yesterday that you took out the fast export from x stuff from bzr-fastimport, does that include the bzr fast import (from svn dumpfile)? [19:12] mgrandi: bzr fast improt never supported importing from a svn dump file [19:12] mgrandi: bzr-svn supports importing from a dumpfile [19:12] hmm, does that get called by bzr fast-import? [19:12] mgrandi: no, they're unrelated [19:12] just trying to understand the structure a bit [19:13] how did i import that svn dumpfile then [19:13] mgrandi: bzr-fastimport only deals with the fastimport/fastexport format used by git-fastexport [19:13] mgrandi: with bzr-svn I think? "bzr svn-import " ? [19:14] yeah [19:14] that seems like it, ok. I was going to say since import from dumpfile seemed important [19:15] mgrandi: it doesn't read the dumpfile directly [19:15] mgrandi: it creates a svn repo first from the dumpfile, and then uses that [19:15] yeah [19:16] i meant the general concept of importing from a dumpfile since svn doesn't seem to have fast-export [19:16] at least i think [19:17] mgrandi: subvertpy has a 'subvertpy-fast-export' command that can generate a fast-export stream [19:18] ah ok. [19:19] also, before you dissapear again, i was wondering if there was anything to kinda 'verify' the integrity of a branch, or is it just bzr check [19:20] mgrandi: just 'bzr check' [19:21] mgrandi: generally, it's better to just talk to the svn repo directly rather than using a dumpfile [19:21] yeah that makes sense. let svn worry about the dump file. [19:21] but i was wondering cause im going to see if this bzr plugin for a IDE works, but it hasn't been updated in like a year so i have no idea if it still works [19:32] mgrandi: the svn dumpfile is a distraction, it just adds two extra steps to the process === r0bby is now known as robbyoconnor === ajmitch_ is now known as ajmitch [22:34] hi all [22:37] 'morning poolie_ [22:37] Can I somehow "bzr ignore" files in a directory that don't have an extension (i.e. a "." in their name). These will be compiled binaries, but I don't want to ignore e.g. the .c source for them [22:38] should be able to with regular expressions [22:39] which i believe bzr uses for bzrignore [22:39] Mhmm? [22:40] bzr ignore "RE:^#" [22:40] so to do a reg exp you put RE: [22:40] you can also look at 'bzr help ignore' for some more examples, you can also tell it to nOT ignore .c files [22:40] so, tell it to ignore everything in that directory, but not c files maybe? [22:41] Oooh that might work too [22:41] or just ignore them all and add -f the source [22:41] Nah, 'cause I'd still like to be reminded about new files in case I forget :) [22:42] LeoNerd: `bzr help ignore` [22:43] so add "somedirectory/*", and then "!somedirectory/*.c" [22:43] ...and I was scrolled up a little [22:44] time to go, laterz [22:46] can also do exactly "that don't have a dot in the name" with /[^.]*/ [22:46] That got it :) [22:46] RE:examples/demo-[^.]+