| === twohey_ is now known as twohey | ||
| meoblast001 | just out of curiosity, is it easier to apply patches in bzr than git? | 02:06 |
|---|---|---|
| davidstrauss | meoblast001: If you have the patch plugin installed, which you should on most platforms, it's just "bzr patch FILE-OR-URL | 02:16 |
| meoblast001 | no wonder i don't use git | 02:17 |
| meoblast001 | i just gave up on trying to patch a file | 02:17 |
| meoblast001 | apply a patch rather | 02:17 |
| davidstrauss | meoblast001: Did bzr patch work for you? | 02:22 |
| meoblast001 | i don't have anything to patch with bzr.. i just know i'm going to have to use it in the future | 02:22 |
| meoblast001 | and wanted to make sure it wasn't as much of a PITA as it is with git | 02:23 |
| davidstrauss | meoblast001: You may want to run "bzr help patch" just to check that you have it installed. | 02:23 |
| meoblast001 | i have Ubuntu so i'm assuming i do | 02:23 |
| davidstrauss | meoblast001: Hmm. It's not in bzr core. | 02:26 |
| meoblast001 | yeah, i have it | 02:26 |
| damijit | I'm having trouble pushing my branch to an SFTP server. | 02:32 |
| damijit | I'm following the instructions here: | 02:33 |
| damijit | http://doc.bazaar-vcs.org/bzr.dev/en/mini-tutorial/index.html#publishing-your-branch-with-sftp | 02:33 |
| damijit | When I push the branch, everyone seems to complete successfully. But when I ssh to the SFTP server to look at my branch, only the .bzr directory is there. None of my files are there. | 02:33 |
| damijit | Does anyone have any idea why this might be? | 02:33 |
| davidstrauss | damijit: bzr does not push a copy of the working tree | 02:52 |
| davidstrauss | damijit: There are plugins to do so, though | 02:52 |
| damijit | davidstrauss: Thanks, I'm looking at this: https://launchpad.net/bzr-push-and-update/. My problem is that bzr is not install on the SFTP server (it is my school's server), so "ssh [remote] bzr update [branch]" fails. Am I out of luck, or is there some way around this? | 03:10 |
| mheld | hey y'all | 03:36 |
| mheld | I'm helping to teach a course in comp sci and I'm trying to use svn to deal with homework handins and assignment/lab handouts | 03:36 |
| mheld | or bzr | 03:36 |
| mheld | basically [PUT VCS HERE] | 03:37 |
| mheld | we have the students pair program through the year but then we have them switch partners a few times through the year | 03:37 |
| mheld | we (ideally) want the students to see the same source when working together, but i'm not sure how we'd do that | 03:37 |
| mheld | I guess we could have one repo for all the handouts and push to each user account then let the students deal with sharing their assignment repos | 03:37 |
| mheld | yeah, I'll probably just make a webapp | 03:56 |
| fullermd | vila: I just ran selftest with up-to-date bzr.dev. Still get the errors that seem related to nonexistent revs (and I forgot --no-plugins, so I get a stack of e.g. qbzr too, but that's another matter) | 09:10 |
| fullermd | vila: But the other stuff you fixed seems fixed here too. | 09:11 |
| vila | fullermd: thanks for the feedback, I'd really like to understand the difference between our setups, | 11:24 |
| vila | so of course 1) Can you re-rerun with --no-plugins (or better BZR_PLUGIN_PATH=-site ./bzr selftest... which is more precise) 2) try again with python25 or 3) teach me how to install python-2.6 while retaining python-2.5 in FreeBSD | 11:26 |
| vila | 2 & 3 are relevant only if you can reproduce the failures, but a mail or better a bug with the failures would be really nice | 11:27 |
| vila | fullermd: I just upgraded the botnet to stop using '--no-plugins' which is one more step on the road to test a set of predefined plugins, but testing against several python versions may be relevant if your intuition is right there | 11:29 |
| Lo-lan-do | Does automatic repacking run for each 10/100/1000/etc. revisions per branch, or per repository? | 13:00 |
| jelmer | Lo-lan-do: repo | 13:04 |
| Lo-lan-do | Great, thanks | 13:10 |
| Lo-lan-do | Hm. Pushing a branch to a 2a repo running bzr 1.16 through bzr+ssh:// yields a "bzr: ERROR: Server sent an unexpected error: ('error', "'LocalTransport' object has no attribute 'startswith'")" errol | 13:18 |
| Lo-lan-do | error | 13:18 |
| Lo-lan-do | Does that ring a bell? | 13:18 |
| Lo-lan-do | The resulting branch doesn't seem to be broken | 13:20 |
| jelmer | Lo-lan-do: no idea, sorry | 14:00 |
| jelmer | Lo-lan-do: seems like something is trying to use LocalTransport as a string | 14:01 |
| Lo-lan-do | np | 14:14 |
| Stavros | hello | 14:40 |
| Stavros | is it possible for me to use bzr with github (and git branches in general), or does it screw things up? | 14:41 |
| jelmer | Stavros: no, that works | 14:43 |
| jelmer | Stavros: I'm using it for some projects | 14:43 |
| Stavros | jelmer: oh, amazing | 14:44 |
| Stavros | which plugin are you using it with? | 14:44 |
| Stavros | i wanted to use github but i didn't want to switch away from bzr | 14:44 |
| Stavros | does it discard any metadata or anything? | 14:44 |
| Stavros | push isn't supported? what? :( | 14:46 |
| jelmer | Stavros: I'm using bzr-git | 14:46 |
| jelmer | Stavros: you can use dpush | 14:46 |
| Stavros | oh, hmm, what's that? | 14:46 |
| jelmer | Stavros: it throws away metadata that can't be stored in git | 14:46 |
| Lo-lan-do | (He's *developing* bzr-git :-) | 14:47 |
| * Lo-lan-do grovels | 14:47 | |
| jelmer | Lo-lan-do: so are you now >-) | 14:47 |
| Stavros | haha | 14:47 |
| Lo-lan-do | Nah, I'm trying to understand it currently. | 14:47 |
| Lo-lan-do | Got your mail, btw, I'll try to fix what you mention, but I won't be at home for a week. | 14:48 |
| Stavros | oh yay, this plugin is awesome | 14:50 |
| Stavros | no more pulling stuff on linux and copying to windows | 14:50 |
| Stavros | yay | 14:50 |
| Stavros | now let's see if it works | 14:50 |
| Stavros | ah, it doesn't :/ | 14:51 |
| Stavros | jelmer: are you trying to read a NamedTemporaryFile anywhere? | 14:52 |
| jelmer | Stavros: We're doing something with temporary files | 14:53 |
| Stavros | jelmer: that doesn't work under windows | 14:53 |
| jelmer | Stavros: though I don't think we're using that specific class | 14:53 |
| Stavros | well, it's failing for me and i'm not getting a traceback :/ | 14:53 |
| jelmer | See also https://bugs.edge.launchpad.net/bzr-git/+bug/382125 | 14:53 |
| ubottu | Launchpad bug 382125 in bzr-git "Can't branch from remote repository on Windows" [Undecided,New] | 14:53 |
| Stavros | but if you want to do it in windows you need to make a file with mkstemp() | 14:54 |
| jelmer | I'm not on Windows, so not entirely sure how to debug that | 14:54 |
| Stavros | is it in dulwich or in your code? | 14:54 |
| jelmer | dulwich is my code too :-) | 14:55 |
| Stavros | oh | 14:55 |
| jelmer | I suspect the code that's problematic for you is in bzr-git | 14:55 |
| Stavros | can you check to see if you're using tempfile? i'm going to comment on that bug but i don't want to be irrelevant | 14:55 |
| jelmer | as far as I can tell we use tempfile.mkstemp everywhere | 14:56 |
| Stavros | hmm | 14:56 |
| Stavros | let me grep the code then | 14:56 |
| Stavros | that's odd, you're right | 14:58 |
| jelmer | I'll be back later today | 14:58 |
| Stavros | ah, okay, thanks for your help | 14:59 |
| jelmer | it could be that we're trying to open that file twice or something | 15:00 |
| Stavros | yeah, might be missing a close() | 15:00 |
| Stavros | so, someone branched off my revision 62 and made various changes to various files. i changed one file they hadn't touched, committed, and then merged their changes. bzr produced conflicts in unrelated files i hadn't touched. is this normal? | 15:07 |
| fm | i am trying to understand pipes. i have one pipe upstream where i created a file. now i switched to another pipe by bzr switch-pipe and i thought the file would be inherited, but it is not .... | 17:14 |
| fm | vila: is there a way to reorder pipes? | 17:21 |
| blueyed | Hi. I've shelved local changes, merged (but have forgotten to commit the merge) and unshelved. Can I separate my local changes now again? | 17:29 |
| blueyed | I'll create a diff against the parent branch, then revert and patch. Looks like what I need. | 17:35 |
| blueyed | this does not work as expected.. gives me a diff of change 7935 (tip) only: bzr diff --old lp:b2evolution -r7909 --new lp:b2evolution -r7934 | 18:02 |
| blueyed | how do I get the changes between 2 revisions in a remote branch? | 18:02 |
| blueyed | oh.. I see.. r7909..7934 should do. | 18:03 |
| blueyed | seems like when using "-r" only the latter gets used? Shouldn't it error out then? | 18:05 |
| RobOakes | Is there any way to specify which text editor bzr uses for comments? Right now, it looks like the default is nano. I would prefer for it to use vi. | 18:12 |
| LarstiQ | RobOakes: I recommend to set $EDITOR and/or $VISUAL | 18:13 |
| LarstiQ | RobOakes: bzr respects those. | 18:13 |
| LarstiQ | as do most tools. | 18:13 |
| RobOakes | That's good to know. Thanks for the tip. | 18:13 |
| LarstiQ | RobOakes: otherwise, `bzr help configuration` mentions you can set the editor explicitly. | 18:14 |
| * LarstiQ back to studying | 18:14 | |
| jam1 | LarstiQ: btw, I'm pretty sure it was nano because that is what 'alternatives' uses as the default editory | 18:29 |
| jam1 | something like /usr/bin/editor ... | 18:29 |
| LarstiQ | right | 18:29 |
| LarstiQ | we fall back to vi after that iirc | 18:29 |
| === jam1 is now known as jam | ||
| meoblast001 | if a file is moved, are things logged as a deletion and creation, or a move? | 19:32 |
| luks | as a move | 19:33 |
| meoblast001 | it seems quite inefficient to me to delete a file and create a new one if both contain the same contents | 19:33 |
| meoblast001 | luks: so it doesn't create a completely new copy of a file? | 19:33 |
| luks | you mean in the repository, right? no, it just changes name for the file entry | 19:34 |
| lifeless | moin moin | 21:24 |
| lifeless | jam: hi; wondering if remove_expensive_references should discard the null node as well | 22:18 |
| Goundy | ow | 22:59 |
| Goundy | I just did a wrong: bzr add | 22:59 |
| Goundy | how can I undo it plz ? | 22:59 |
| Goundy | note: Haven't committed yet | 23:00 |
| exarkun | bzr revert | 23:00 |
| Goundy | ow shit | 23:00 |
| Goundy | it fucked all up >_< | 23:00 |
| mwhudson | bzr rm --keep the-file-you-added | 23:01 |
| Goundy | well it re-added my files anyway | 23:01 |
| Goundy | thanks guys | 23:01 |
| fullermd | vila: (1) yields nothing unexpected; usual list of fails. | 23:08 |
| igc | morning | 23:38 |
| * fullermd waves at igc. | 23:39 | |
| igc | hi fullermd! | 23:39 |
| poolie | good morning | 23:41 |
| lifeless | hi poolie | 23:48 |
| igc | hi lifeless, poolie | 23:49 |
| * lifeless watches memory usage go past 5G | 23:52 | |
| * fullermd . o O ( `bzr memtest86` ) | 23:54 | |
| lifeless | fullermd: meliae - johns py_memory_dumps' final name | 23:54 |
| lifeless | fullermd: I'm tuning it to let me analyse a dump I got from the fast-import of netbeans, when that when up the kneebend @56K revisions | 23:54 |
| lifeless | 28012 robertc 20 0 5352m 5.2g 1036 R 100 90.2 22:16.97 python | 23:55 |
| lifeless | so this is a dump, of the memory graph, of a 6.4GB runaway process | 23:55 |
| lifeless | I have 6GB of ram on this box :P | 23:55 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!