=== beuno_ is now known as beuno === Guest88485 is now known as jelmer [02:18] hi [02:19] ok...so i've created a project on launchpad and i need to know how to post my code on there using bzr...is there a guide to do it anywhere? [03:41] milleja46: bzr push lp:~youruserid/yourprojectname/branchname [03:42] lifeless: will that work since it's just the initial code for the project? [03:44] apparently not..... i did "bzr push lp:~milleja46/m46sgoffice/trunk" and it reported "bzr: ERROR: Not a branch: "C:/Python27/projects/M46 Office Suite/"." [03:46] is there a reason for that? i sholdn't have gotten that error if this is the first code for the project... [03:46] well...i'll be back in the morning...gotta go to bed before i fall asleep at the computer... [08:19] Um, if I did `bzr revert file`, is there any way to undo that action? [08:19] (I typed the wrong filename there :-/) [08:21] The man page mentions that revert backs up the file, is there a command to restore the backup, or I do it manually? [08:23] alkisg: Just do it manually. ls -ltr file* [08:23] * alkisg did it manually - thank you === med_out is now known as medberry [12:22] poolie: I'm happy to make you a happy child ;-p http://www.happychild.org.uk/islands/O.htm [12:23] haha [12:28] jelmer: of course he missed the joke which is waiting for his laptop to be opened again ;) [12:37] mgz: I'm giving up on those issues for now. Have tagged them all with 'unicode' in case it makes sense to fix them in a cluster. https://bugs.launchpad.net/testtools/+bugs?field.tag=unicode [13:59] ok...i created a project last night on launchpad...but my question is...how do i upload my current code i have on my computer to at least have that basis there? [14:01] You probably want to read some of the introductory Bazaar documentation [14:03] maxb: well i thought i would just do lp~milleja46/m46sgoffice/trunk but doesn't seem to work... [14:03] You're missing a colon [14:03] lp:...... [14:04] i forgot it on that when posting on here...i actually put it when i did the push command [14:04] Then you need to explain "doesn't work" [14:05] it reports "bzr: ERROR: Not a branch: "C:/Python27/projects/M46 Office Suite/"." [14:08] ^that's what i mean by doesn't work [14:37] Hey, is there a way I can configure bazaar to automatically add files in a directory rather than doing so manually? [14:38] jamdahl: you can run "bzr add" (without arguments) to add all unknown files [14:40] Thanks jelmer, is there a set of arguments for add to add all files in subfolders but not in main directory? [14:40] jamdahl: "bzr add" works recursively, so it should work if you specify the subfolders [14:41] Is there a way to do that without specifying? [14:42] In my particular case, I know there is going to be some junk in the main folder I don't want versioned but stuff added to folders that I always want versioned [14:50] can anyone answer my question? i have a new project on launchpad but i need to know how to seend my code i have so far to it...how do i do that? the command it tells me on the page doesn't work...reports it's not a branch [14:53] jamdahl: you should be able to add the junk to .bzrignore and then run "bzr add" - it should ignore things that are in .bzrignore [14:54] milleja46: can you be more specific, what command does it tell you to run? [14:55] bzr push lp:~milleja46/m46sgoffice/trunk <-but it reports that where i'm pushing from isn't a branch...i don't think it should because i need to put my latest code on there right now... [14:55] milleja46, what's the exact error that command gives you? [14:56] "bzr: ERROR: Not a branch: "C:/Python27/projects/M46 Office Suite/". [14:56] milleja46, you don't have a branch locally, so it has nothing to push [14:57] milleja46, you should be able to create one with "bzr init" and then add your files with "bzr add" and "bzr commit" [14:57] i know...but i need to put the inital code on the project... [14:57] or see http://doc.bazaar.canonical.com/latest/en/mini-tutorial/ for the tutorial [14:58] milleja46, you have to create a branch locally before you can push that branch to Launchpad [15:16] jelmer: ok...now that i've run through that...how do i convert it to a branch so that i can use it with launchpad? [15:16] milleja46, run the push command you tried earlier [15:17] i did that and now it reported "bzr: ERROR: Not a branch: "C:/Python27/projects/M46 Office Suite/m46sgofficesuite/.bzr/branch/": location is a repository." [15:19] milleja46: It seems like you just created a repository, not a branch; what commands did you run [15:19] ? [15:19] the ones to make it a repository but ti doesn't say ones for making my code the original code for the project [15:20] milleja46, you have to create a branch as well [15:20] (not just "bzr init-repo", but "bzr init" too) [15:21] how do i do that? i've forgotten how to do it... [15:23] milleja46: "bzr init" to create an empty branch (see http://doc.bazaar.canonical.com/latest/en/mini-tutorial/ for background) [15:27] spiv: if you're around, poolie is looking for you [15:34] jam: ok, I'll head to the lp room [15:35] I've noticed that the size of my local repo was getting huge; tracked it down to having ~ 50 packs in '.bzr/repository/packs'. running 'bzr pack --delete-obsolete-packs' fixed the issue -- back down to reasonable size, with just one pack. but as i continue to pull/add/etc, the packs are accumulating again. [15:35] is this normal behavior? shouldn't packs be getting auto-managed? or do i need to keep manual exec of 'bzr pack' as part of my regular maint [15:36] dchilton: they are auto-managed, and the obsolete pbacks will be gradually removed over time [15:37] spiv the oldest of those ~50 packs was around 4 months old ... i had NO packs in /repository/obsolete-packs. [15:37] something not configured right on my end? [15:38] the total repository had swelled, because of those unmanaged packs, to around 35x the size of the actual managed files/dirs [16:03] When I install bzr on my mac, it installs bzrlib in the site-packages of an old install, not my current install [16:04] How can I tell the installer which python to use (because it's not using the one given by "which python")? [16:05] magmatt do you need/use anything in the 'site-packages of an old install'? if not, what happens if you temporarily move that dir out of the way? [16:06] lemme try [16:10] dchilton: I moved it then installed from the dmg. The installer recreated the directory :) http://paste.pocoo.org/show/425906/ [16:10] And filled site-packages with bizarre things [16:10] *bazaar [16:13] is there a way to install from source? [16:15] magmatt: to install bzr from source? or ptyhon? [16:15] magmatt: fwiw, i pull the bzr repo, then 'make', 'python setup.py install'. [16:15] that should work [16:15] magmatt: ah, are you using a Mac package installer? [16:15] poolie: bzr [16:15] dchilton: yes [16:16] dchilton: bzr should normally repack them [16:16] $5 sez it's presuming a target dir. try the source install. [16:16] unless you're running a very early 2.0 version maybe [16:16] dchilton: yes, I'm trying from source right now [16:16] poolie: 2.6.6 [16:16] Riddell: can you tag your gpg bugs so we can link them together to see the overall state of it? [16:17] actually, I'm trying easy_install first [16:17] I think I did [16:17] easy_install wins [16:17] poolie: they all have the tag "gpg" [16:17] poolie: that's what i figured. apparently, in my case, it isn't. i'm running '2.3.4dev' [16:21] magmatt: er, 2.6? [16:21] dchilton: python 2.6.6, bzr 2.4b4 [16:21] ah [16:26] dchilton: thanks [16:26] worked? [16:30] poolie: fwiw, atm, every new commit seems to create an additional pack file. [16:31] what's being created seems small ... likely proportional to the size of the commit? [16:34] dchilton: IIRC, it'll go 1 commit per pack, then when you hit 10 commits, those will be repacked into a single one. And then repeat that pattern. [16:34] When you get to 10 * 10 commit packs, they get repacked into 1 100 commit pack [16:34] etc..... === JasonOO is now known as JasonO [16:35] maxb: that sounds like a reasonable approach. at least for a default. again, apparently not happening here. === JasonO is now known as Guest30760 [16:41] dchilton: So, I just ran a quick shell for loop to commit 1001 revisions to a repository, tracking the pack count - it's as I suggested [16:41] You get up to 27 packs at r999 before you drop back to 1 at r1000 [16:42] ooh, that's pretty [16:43] The expected number of packs if bzr is left to autopack automatically is the sum of the value of all the digits in the number of revisions :-) [16:53] maxb: unclear to me whether my case falls within those 'tortured' constraints. so can i override this? basically, i'd like NOT to have a 35GB repo for 1GB of files being tracked ... solely due to unmanaged packs. of course, i *can* add 'bzr pack' to my mgmt repertoire ... just useful to know if that's the only/best/recommended way to handle this. [16:55] I don't understand why your repository is so big [16:55] Repeated manual 'bzr pack' should never be necessary - in particular because it has to do I/O over the entire history of the repository each time. [16:56] How much of your tree is changing in every commit? [16:56] maxb: well, it's cuz there are, well *were*, lots of really big packs ... each about the size of the files/dirs under mgmt [16:56] maxb a few files at a time. not a whole bunch. [16:57] dchilton: oh they're accumulating in obsolete packs? [16:57] or they're in plain packs/ [16:57] hi maxb [16:57] poolie: nope. there is *nothing* in ../obsolete-packs. ever. [16:57] all just in ../packs [16:57] hm [16:57] that's strange [16:57] is there anything unusual about your environment? [16:58] poolie: unusual --> probly that *I* am involved ... [16:58] other than that, not really [16:59] I suppose if you commit a large amount of changed files in several successive commits, you might end up with a bloated repository until the next autopack kicks in [17:00] maxb: sure. but, i don't think i've ever committed more than about 20 edits to text files at a time ... [17:01] Quite mysterious [17:02] hm. would '.bzrignore' interpret/parse these two entries differently?: "./test/*" and "./test/" [17:04] maxb poolie so, until if/when i find a gremlin, is there any *harm* to occassionally/regularly running 'bzr pack --delete-obsolete-packs' ? [17:04] You mean --clean-obsolete-packs? [17:05] You've seen the warning in bzr pack --help, right? [17:05] Other than that, the only harm is wasted time [17:06] maxb: yes, --clean... yes, saw the warning. re: wasted time ... a tradeoff: less than backing up bloated repos. [17:06] thx. [17:12] off for moar coffee ... ta! [17:47] <[1]reggie> bzr gurus -- how do I undo a push? [17:54] [1]reggie: 'bzr push --overwrite -r OLDREV' [17:54] <[1]reggie> spiv, thx [18:30] man I hate doctestmatches === medberry is now known as med_out [20:05] is there a "better way" to make a reverse patch than to do: [20:05] bzr diff -r-1..-2 >..reverse.patch [20:05] patch -p0 <../reverse.patch [20:05] bzr commit -m "reverse previous commit" [20:05] ? === yofel_ is now known as yofel