| rockstar | Wow. Just, wow. http://github.com/guides/completely-remove-a-file-from-all-revisions | 00:18 |
|---|---|---|
| Pieter | ool huh | 00:19 |
| Pieter | *cool huh | 00:19 |
| rockstar | Pieter, I hope you just forgot your sarcasm tags. | 00:19 |
| Pieter | no | 00:19 |
| Pieter | why? | 00:19 |
| rockstar | Pieter, you should never be changing revision data. Revisions should be immutable. | 00:20 |
| Pieter | revisions are also immutable in git | 00:20 |
| Pieter | there are valid use cases, like having a plaintext password as the guide says... that's very difficult to do in bzr | 00:20 |
| rockstar | Pieter, if you commit a plaintext password, you change your password. | 00:21 |
| Pieter | or you just edit it out like in the guide, that's a lot easier :) | 00:21 |
| Pieter | there are other use cases, like going public with some code but having to remove some company-sensitive information before publishing it | 00:22 |
| rockstar | Pieter, do what launchpad is doing and create a fresh branch. | 00:22 |
| Pieter | and then how are you going to remove that info? | 00:23 |
| thecookie | I wont have any local history with --no-tree? | 00:23 |
| rockstar | There is no info to remove. It's bzr init. | 00:23 |
| Pieter | and loose all your history just because there's some sensitive information in it? | 00:23 |
| Pieter | that's kinda lame | 00:23 |
| rockstar | Pieter, so you're going through all 100,000+ revisions making sure that EVERY bit of data is clean for the general public? | 00:24 |
| Pieter | you don't have to have 100,000 commits ;) | 00:24 |
| Pieter | but if you have, say 100, but there are a few files in it you rather wouldn't have public | 00:24 |
| Pieter | sure, you do stuff like this | 00:24 |
| Pieter | why not? it's easy | 00:24 |
| rockstar | Pieter, okay. You change your revision data. | 00:25 |
| Pieter | everybody will thank you for publishing the full history :) | 00:25 |
| sohail | one time some people on my team said the team lead was hairy and wrestled bears on his free time | 00:37 |
| sohail | the checked that into svn | 00:37 |
| sohail | I thought it was pretty funny but when I left the company, removed it :-) | 00:38 |
| Pieter | why? | 00:38 |
| Pieter | (At first I thought that with 'team' you meant 'baseball team' or something, and then started to wonder why they'd use svn) | 00:39 |
| sohail | lol | 00:41 |
| sohail | why remove it? | 00:41 |
| Pieter | yes | 00:42 |
| Pieter | and why remove it when you left? | 00:42 |
| sohail | I was still involved but in a more authoritative capacity | 00:42 |
| sohail | wanted to make sure that I didn't encourage that type of thing against others | 00:43 |
| sohail | I left the company but was consulting sorry if that wasn't clear :-) | 00:43 |
| Pieter | ah, right, I was thinking "why would you care?" | 00:43 |
| sohail | it's a tricky thing | 00:44 |
| sohail | it was actually quite clever | 00:44 |
| sohail | the person responsible checked it in as a Python pickled. should have saved it. | 00:45 |
| jkakar | Is there an equivalent of 'bzr cp SRC DEST'? I want to copy a file and make changes to it with its own history, after the copy, but if possible, to capture that a fork occurred. | 01:41 |
| Peng_ | jkakar: No. | 02:09 |
| jkakar | Peng_: Thanks. | 02:10 |
| Peng_ | Sorry. :\ | 02:11 |
| glyph | jkakar: wow | 02:27 |
| glyph | jkakar: what an odd omission! I must be really good about not duplicating code, since I've never needed that :) | 02:27 |
| Peng_ | glyph: Heh. One use is when splitting a file into two. OTOH, I suppose if you organize your code well enough from the beginning, you won't need to.. | 02:30 |
| glyph | Peng_: I can definitely see uses for it | 02:38 |
| === udk is now known as UdontKnow | ||
| jkakar | glyph: Heh. I'm implementing a new skin and want to use the CSS file from an existing skin as the base for the new one. | 03:47 |
| BasicPRO | Anyone know what's going on with launchpad? After gw0-0-gr.canonical.com latency skyrockets for me | 04:11 |
| === BasicPRO is now known as BasicOSX | ||
| Peng_ | BasicOSX: WFM. Is it still happening to you? | 04:23 |
| Peng_ | (Just trying launchpad.net.) | 04:23 |
| BasicOSX | Peng: yes, semi-intelligent discussion about it on #launchpad | 04:23 |
| Peng_ | BasicOSX: Oh, right. | 04:23 |
| AfC | Hooray for distributed revision control systems and not depending on a single point of failure like that. | 04:25 |
| wgrant | I'm not sure that bazaar.launchpad.net is actually broken. | 04:25 |
| BasicOSX | $ bzr branch lp:bzr | 04:28 |
| BasicOSX | bzr: ERROR: xmlrpc protocol error connecting to https://xmlrpc.edge.launchpad.net/bazaar/: 503 Service Temporarily Unavailable | 04:28 |
| wgrant | Ah, forgot about the XML-RPC server. | 04:29 |
| Peng_ | Heh. | 04:29 |
| wgrant | But using bzr+ssh directly might well work. | 04:29 |
| BasicOSX | I'd prefer not to step out of the documented and trusted release procedure :-) | 04:29 |
| Peng_ | Eh, nothing will go wrong if you do. Probably. :-D | 04:31 |
| LKRaider | question: can I branch a launchpad project to my local machine, and bind that branch to a hosted launchpad project on my account, so that when I bzr update, it retrieves from the original trunk and bzr commit sends to my hosted project? | 04:56 |
| LKRaider | I was trying it like this: | 04:58 |
| LKRaider | bzr init | 04:58 |
| LKRaider | bzr branch lp:project | 04:58 |
| LKRaider | bzr branch project mybranch | 04:58 |
| LKRaider | cd mybranch | 04:58 |
| LKRaider | bzr push lp:~(account)/project/mybranch | 04:59 |
| LKRaider | bzr bind lp:~(account)/project/mybranch | 04:59 |
| BasicOSX | I think you just want to do a bzr push --remember your-repo | 04:59 |
| LKRaider | without the bind command? | 05:01 |
| RexEast | Hi! I'm new to Bazaar (and version control in general), and am looking to find whether this tool is suited to my project. I'm working on a Django project solo. I would like to run the public version of my web app on mysite.com, and meanwhile be working on new features on mysite.com/test. Once I've tested a new version, I want to be able to update the main version with my development branch. What would be the simplest way to d | 05:02 |
| RexEast | By the way, for more context, the precursor to this question is here: http://stackoverflow.com/questions/625256/how-do-i-run-one-version-of-a-web-app-while-developing-the-next-version | 05:02 |
| LKRaider | btw, uncommit rocks :) | 05:04 |
| BasicOSX | LKRaider: sorry only 20% here, monitoring the outage on launchpad | 05:07 |
| LKRaider | oh, yeah, launchpad comes first :) | 05:09 |
| LKRaider | I believe the --remember flag is what I want. testing right now | 05:10 |
| RexEast | (...alternately, let me know if another tool like SVN would be better suited for this task. Someone originally recommended SVN to me but I figured bzr could do it as well.) | 05:12 |
| BasicOSX | RexEast: I use bzr under turbogears and works very well, use a similar strategy, except I have a production server and development server | 05:16 |
| LKRaider | BasicOSX: doesnt seem to work as I want it. if I do bzr update, it returns as up-to-date, even tho I have branched from a middle revision from the original trunk | 05:17 |
| BasicOSX | LKRaider: after you branch don't do update to merge | 05:18 |
| BasicOSX | bzr merge --remember upstream | 05:18 |
| BasicOSX | make changes | 05:18 |
| BasicOSX | bzr push --remember your-repo | 05:18 |
| RexEast | @BasicOSX: neat! How would I get started with something that works like yours? Note: I don't need separate servers; this is a very small-time operation for now. The dev version can be on the same server as the production version. | 05:18 |
| BasicOSX | RexEast: create your dev repo, then bzr push it to a central area | 05:20 |
| BasicOSX | Then bzr branch from the central area into your production | 05:20 |
| BasicOSX | work all you want in your dev repo. bzr committing as you wish | 05:21 |
| BasicOSX | when happy with the work, bzr push dev to central area | 05:21 |
| BasicOSX | then bzr merge in your production | 05:21 |
| BasicOSX | If you have to tweak things in product, just bzr commit and push to a different report if need be, at least that is how I do it | 05:22 |
| BasicOSX | There is probably some way if doing series and whatnot, but what I do is pretty simple | 05:22 |
| RexEast | Thanks! I'm going to read over that for a minute and try to figure out which commands I'd use to set that up on my Linux box. | 05:24 |
| LKRaider | BasicOSX: thanks, your idea seem to work fine for me now :) | 05:28 |
| LKRaider | can I use bzr bind, after the push, so that commits go to the hosted branch automatically? or would that break something? | 05:30 |
| RexEast | @BasicOSX: why do I need to have the central area? Couldn't I just push my changes directly from my dev repo to the production server? (Sorry, I'm new to all this :) | 05:36 |
| BasicOSX | generally there's a few difference between production and development, like what database or tables you use, debug, logging, etc. The split allows for both code bases to live in the central area but branches to live in production and development | 05:39 |
| BasicOSX | My reasons for it are more simple, I was my repository on a different box so have code in multiple places incase hardware crashes and burns | 05:40 |
| BasicOSX | also production has live access to the Internet, development restricted access, still to the Internet, I put my repo that is not on the box incase there is a compromise | 05:40 |
| adelie421 | Anyone free to help a noob? Do I need to register a branch before I use bzr send -o foo.patch? | 05:50 |
| adelie421 | I am feeling a bit overwhelmed here trying to properly submit a patch. I have been following http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html | 05:50 |
| LKRaider | I think this will create a patch file that you'll have to email to the upstream project somehow | 05:52 |
| LKRaider | if you are using launchpad, there is a merge button that you can use to request your branch to be merged on the parent trunk | 05:53 |
| LKRaider | but I am a noob too :P | 05:53 |
| Peng_ | adelie421: If your branch is public, it would be easier to say "hey, merge my branch at http://whatever".. | 06:01 |
| Peng_ | adelie421: But no, you don't need a public location when using "bzr send". | 06:01 |
| Peng_ | adelie421: You should make sure the public_branch is set properly on your copy of the target branch, though. | 06:01 |
| adelie421 | Peng_: sorry, was afk. So wanted to fix some bugs in example-content. I used bzr branch (site), bzr merge, added my pieces, then bzr add, bzr commit -m "details", bzr send -o details.patch. it uploaded and said successful. Thats it, right? | 06:29 |
| BasicOSX | lifeless: ping? Did you PQM 1.13-cherrypicks? | 06:30 |
| Peng_ | adelie421: ...More or less, probably. | 06:38 |
| Peng_ | adelie421: It's good to have the proper public_branch value set, to make it easier for people merging it. | 06:38 |
| Peng_ | adelie421: I'm not sure if that would happen automatically or not. | 06:39 |
| adelie421 | I got an email from the maintainer seperately, so hopefully they will let me know if I did id right. I figure given the time I should just take a break for now and follow up on that tomorrow | 06:40 |
| savvas | hello, does anyone know how to set a server-side variable in bzr branches? | 10:46 |
| savvas | specifically: cia_project = timekpr | 10:47 |
| savvas | ( in .bzr/branch/branch.conf ) | 10:47 |
| === pigmej1 is now known as pigmej | ||
| LarstiQ | mtaylor_: r4142 of bzr.dev looks like it might adress our push problem | 11:52 |
| === AfC1 is now known as AfC | ||
| SamB | man, I wish there was a MIME registration for diff-style patches :-( | 14:41 |
| jelmer | SamB: bzr-gtk registers bzr-handle-patch for one of the mime types I think | 14:57 |
| SamB | hmm, three different types | 15:01 |
| SamB | mime_types=text/x-diff,text/x-patch,application/x-bazaar-merge-directive | 15:02 |
| LarstiQ | Spaz: saw http://bazaar-vcs.org/BzrFileCopieshttp://bazaar-vcs.org/BzrFileCopies ? | 15:19 |
| LarstiQ | Spaz: the last one being what `bzr send` produces | 15:20 |
| pigmej | hmm | 17:48 |
| pigmej | how to get touching revisions for file | 17:49 |
| pigmej | not a file_id ? | 17:49 |
| pigmej | for file_id there is method | 17:49 |
| pigmej | log.find_touching_revisions(branch, file_id) | 17:49 |
| pigmej | how to do the same but without file_id ? | 17:50 |
| pigmej | or how to generate file_id ? | 17:50 |
| pigmej | I know only revtree.inventory.revision.path2id(file_path) | 17:51 |
| jelmer | pigmej, in order to find the file id for a particular path, you need to retrieve the inventory first | 17:52 |
| pigmej | jelmer: right, but I'm looking for touching revisions... | 17:52 |
| pigmej | so I don't know with inventory is correct... | 17:53 |
| pigmej | I need to make "list of revisions for file" | 17:53 |
| jelmer | pigmej, that sounds like a chicken-egg problem | 17:53 |
| jelmer | pigmej, in order to refer to a particular file you need to find its file id | 17:53 |
| jelmer | pigmej, since there may be different files with the same name in different revisions | 17:54 |
| pigmej | jelmer: but not the same file path | 17:54 |
| jelmer | pigmej, yes, with the same file path | 17:54 |
| jelmer | pigmej, e.g. if you have a revision in which path "foo" exists | 17:55 |
| pigmej | jelmer: right... delefe, add and that's it... | 17:55 |
| jelmer | then the next revision could rename "foo" to "bar" and add a new file "foo" | 17:55 |
| pigmej | Yes you're right jelmer.. | 17:55 |
| jelmer | the fileid of "foo" would stay with the original file | 17:55 |
| jelmer | and the new "foo" that is added would have a new file id | 17:55 |
| pigmej | So, I need to rewrite one class... :) | 17:57 |
| pigmej | To avoid problems with renamed files ;) | 17:57 |
| pigmej | jelmer: thanks I forgot about that possibility :d | 17:57 |
| === serg_ is now known as serg | ||
| === mtaylor_ is now known as mtaylor | ||
| Spaz | <LarstiQ> Spaz: saw http://bazaar-vcs.org/BzrFileCopieshttp://bazaar-vcs.org/BzrFileCopies ? | 21:52 |
| Spaz | <LarstiQ> Spaz: the last one being what `bzr send` produces | 21:52 |
| Spaz | LarstiQ, hadn't heard of it | 21:52 |
| Spaz | hm. | 21:52 |
| LarstiQ | Spaz: oh bah, I tab-completed wrongly on that second line | 21:55 |
| LarstiQ | Spaz: the first was for you though :) | 21:55 |
| Spaz | hm ok | 21:55 |
| LarstiQ | SamB: in case you didn't get it at the time, the `bzr send` comment was supposed to be direct at you ;) | 21:56 |
| LarstiQ | Spaz: anyway, it seems Ian is looking at it recently | 21:56 |
| Spaz | hmm | 21:56 |
| LarstiQ | Spaz: so providing feedback/coordinating with him seems like the thing to do | 21:57 |
| Spaz | i could do that | 21:57 |
| Spaz | unfortunately, i'm moving atm. will be semi-difficult for a week or so. | 21:57 |
| LarstiQ | Spaz: that's fine, I'll bother you again in a weeks time :) | 21:59 |
| Spaz | i'll find time still | 22:01 |
| Spaz | :p | 22:01 |
| cody-somerville | I've tried to make my repository smaller by using bzr pack and bzr reconcile but instead it made it over three times bigger (its now at 3.2GB). | 22:50 |
| Peng_ | cody-somerville: Right. "bzr pack" doesn't make it much smaller. However, it *does* create a complete backup of the entire repo. :D | 22:56 |
| cody-somerville | joy | 22:57 |
| cody-somerville | how do I delete that? | 22:57 |
| cody-somerville | is there a bzr clean ? :P | 22:57 |
| Peng_ | cody-somerville: Well, the backup is created for a reason: so if you lose power before the new pack hits the disk, you won't lose your repo. | 22:57 |
| * cody-somerville nods. | 22:58 | |
| Peng_ | cody-somerville: rm .bzr/repository/obsolete_packs/* (but *don't* delete the directory itself!) | 22:58 |
| cody-somerville | Peng_, okay, so that brings it down to 1.6GB | 22:58 |
| cody-somerville | what is launchpad/.bzr/repository/upload ? | 22:59 |
| Peng_ | cody-somerville: Temporary storage while creating new packs (e.g. when running "bzr pull" or even "bzr pack"). | 23:01 |
| cody-somerville | It is 647M and I'm not doing either. | 23:01 |
| Peng_ | cody-somerville: If there are any six-month old files in it, bzr probably crashed during the middle of a pull and didn't clean up for some reason. | 23:02 |
| Peng_ | cody-somerville: I'm sure it's safe to clean it out, but I've never done it, so don't sue me if something goes wrong... :P | 23:02 |
| cody-somerville | There seems to be a lock file in there so I'll leave it be for now | 23:03 |
| LarstiQ | BasicOSX: http://pqm.bazaar-vcs.org/ for the current queue | 23:44 |
| * LarstiQ falls asleep | 23:47 | |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!