| RAOF__ | spiv: Sensible laptop! | 00:03 |
|---|---|---|
| spiv | RAOF__: :) | 00:04 |
| === cody-somerville_ is now known as cody-somerville | ||
| === RAOF__ is now known as RAOF | ||
| * spiv -> lunch | 02:20 | |
| thumper | jelmer: ping | 02:22 |
| jelmer | thumper, pong | 02:22 |
| thumper | jelmer: how goes the bzr-git import stuff? | 02:23 |
| thumper | I was just looking at your samba page for dulwich | 02:23 |
| jelmer | thumper, so, dulwich (our underlying git library) has seen a release yesterday | 02:23 |
| thumper | I knew there would have been a reason for the name of the library | 02:23 |
| thumper | but I didn't know what it was | 02:23 |
| thumper | :) | 02:23 |
| jelmer | thumper, :-) | 02:24 |
| jelmer | thumper, I've also frozen the current mappings | 02:24 |
| thumper | jelmer: have you changed the generated rev ids to use v1 rather than experimental? | 02:24 |
| jelmer | so if you use current bzr-git to do an import it won't break in the future (barring bugs, of course) | 02:24 |
| jelmer | thumper, yep | 02:24 |
| thumper | cool | 02:25 |
| thumper | I'll move our plans along then | 02:25 |
| thumper | has there been a release of bzr-git officially? | 02:25 |
| jelmer | not yet | 02:25 |
| thumper | planned one? | 02:25 |
| jelmer | there's some regression that broke remote branching that I'm working at fixing at the moment | 02:25 |
| * thumper nods | 02:25 | |
| thumper | jelmer: can I get you to email me when you have a release? | 02:26 |
| jelmer | after that I hope to do a 0.1 release | 02:26 |
| thumper | we'll work on the git imports for LP on that | 02:26 |
| jelmer | thumper, yeah, np - I'll cc you on the announcements | 02:26 |
| thumper | ta | 02:26 |
| thumper | fantastic | 02:26 |
| solitude` | hey, I'm very new to versioning clients, I have bzr installled... i'm wondering what approach I should use for making a CMS for users to login and see the files and edit them... Like, do I make a php script/page that connects to the bzr server to modify/update the different files?? | 03:54 |
| solitude` | Because I need some sort of interface for staff members to edit the site, and folks are saying to use subversion for that, but bzr looks less complex.... am I on the right path? | 03:55 |
| thumper | so you are writing a content management system? | 03:57 |
| solitude` | yeah | 03:57 |
| solitude` | I wrote on in PHP last summer but ran into a roadblock when I was trying to figure out how to let staff members edit differnt files/pages of the website, and now I hear that this is the best approach | 03:58 |
| thumper | well, bzr is written in python | 03:59 |
| thumper | so you could either call into python at the system command level... | 03:59 |
| thumper | or use the python bzrlib somehow | 03:59 |
| thumper | although from PHP, I don't know how | 03:59 |
| solitude` | well I know some python, and I know how to pass variables between python and PHP | 04:00 |
| thumper | unless someone has embedded python into PHP recently | 04:00 |
| thumper | :) | 04:00 |
| solitude` | I just make a simple python socket and have PHP connect to that , kinda like sql | 04:00 |
| thumper | python socket? | 04:00 |
| solitude` | yeah, a python script that listens on a port and runs on the server | 04:00 |
| solitude` | so the python script could communicate with bzr | 04:01 |
| thumper | ok, well, you could have your python script accept "commands" with text and have that script use bzrlib | 04:01 |
| solitude` | bzrlib = bzr, right? | 04:02 |
| solitude` | I'm still figuring out bzr :) | 04:02 |
| solitude` | I just wanna make sure I'm approaching this correctly | 04:02 |
| thumper | bzr is the command line tool | 04:03 |
| thumper | bzrlib is the python library behind it | 04:03 |
| solitude` | hmm | 04:03 |
| thumper | bzr comes with bzrlib | 04:03 |
| solitude` | don't you just need the command line, to make any changes?? | 04:03 |
| thumper | you could do it that way | 04:03 |
| thumper | but you don't need to | 04:03 |
| solitude` | i see | 04:04 |
| thumper | to be honest, it may be your quickest way of getting something working | 04:04 |
| solitude` | just using hte command line? | 04:04 |
| solitude` | or the bzrlib | 04:04 |
| thumper | yes, to start with | 04:04 |
| thumper | yes commandline | 04:05 |
| solitude` | okay | 04:05 |
| solitude` | What does bzrlib offer that command line doesnt? | 04:05 |
| thumper | complete program flexability :) | 04:05 |
| solitude` | okay, I'll have to look into that once I get the basics of bzr down and the CMS | 04:06 |
| solitude` | thank you thumper =) | 04:06 |
| thumper | np | 04:06 |
| bialix | does LarstiQ around? | 05:02 |
| bialix | hey guys, when typically LarstiQ hanging there? (timeframe) | 05:03 |
| * bialix will try later | 05:08 | |
| sadmac | how do I set the email address that shows up with my commits? | 06:18 |
| spiv | sadmac: "bzr whoami" | 06:24 |
| sadmac | spiv: figured it out. thanks | 06:25 |
| vila | hi all | 07:29 |
| bialix | bonjour | 07:33 |
| * thumper looks around for someone to upload bzrtools into the ~bzr PPA | 08:06 | |
| speakman | hi folks! Is there any way to undo a pull, which has screwed up the log? | 08:36 |
| spiv | speakman: you can pull -r SOME_REV --overwrite | 08:36 |
| spiv | speakman: but what do you mean by "screwed up the log"? | 08:36 |
| speakman | it replaced the log mainline with the log of the log of the branch which has some strange merges and stuff | 08:38 |
| speakman | what I wanted to do was a merge. | 08:38 |
| spiv | Ok. So yes, bzr pull as I said above to bring the branch back to the point it was at before. | 08:39 |
| speakman | can I use -r -1 for it? | 08:41 |
| spiv | speakman: pull -r -1 would be a no-op | 08:43 |
| spiv | Oh, unless you mean to pull -r -1 of some other copy of the branch onto your copy. That would work. | 08:44 |
| spiv | But if you don't have another copy, then you'll need to look at the log and and find where the mainline stops being what you wanted (i.e. commits from someone else). That's the point at which the other branch diverged from yours, and so you want to go back to that revision. | 08:45 |
| * spiv -> dinner | 08:45 | |
| speakman | It did work, thanks alot. | 08:53 |
| spiv | speakman: great. glad I could help. | 08:59 |
| === asac_ is now known as asac | ||
| Lo-lan-do | I'm still struggling to find a way to get git and bzr to cooperate... I may be missing something, but I can't seem to get it working. | 10:52 |
| Jc2k | Lo-lan-do: ? | 10:55 |
| Jc2k | are you playing with bzr-git or something else.. | 10:55 |
| Lo-lan-do | I tried bzr-git and git-bzr. | 10:57 |
| Jc2k | bzr-git doesnt have push yet, but bzr branch should work against git:// | 10:58 |
| Jc2k | i think it can only get the master branch, tho | 10:58 |
| Jc2k | i think there is a git-import to get the full repository | 10:58 |
| Jc2k | push should come soon. i've been working on some parts of it in dulwich | 10:59 |
| Lo-lan-do | I managed a branch, but when I added a commit into the git dir then I couldn't branch it again. | 10:59 |
| Jc2k | oh? | 11:00 |
| Jc2k | what error? | 11:00 |
| Lo-lan-do | File "/home/roland/.bazaar/plugins/git/dulwich/dulwich/repo.py", line 223, in _get_object | 11:01 |
| Lo-lan-do | assert len(sha) in (20, 40) | 11:01 |
| Lo-lan-do | (AssertionError) | 11:01 |
| Jc2k | oh cripes. | 11:01 |
| Jc2k | dont suppose the git repo is online somewhere? | 11:02 |
| Lo-lan-do | It's a clone of git://git.debian.org/apt-build/apt-build.git | 11:02 |
| Lo-lan-do | (I took a random reasonably-sized one :-) | 11:02 |
| Lo-lan-do | Then I added a simple commit inside. | 11:02 |
| Lo-lan-do | Might be relevant: I upgraded to git 1.6 after the cloning. | 11:03 |
| Jc2k | hmm, i cant imagine they changed the object format in 1.6 | 11:03 |
| Lo-lan-do | Dunno. When I tried to push (earlier), bzr complained about not finding a .git/inventory file or so. | 11:04 |
| Jc2k | yeha, push isn't implemented at all. most of the pieces are there for dpush i think, just need to tie it all together. | 11:05 |
| Jc2k | Lo-lan-do: did you do the simple commit with git or bzr? | 11:05 |
| Lo-lan-do | git | 11:05 |
| Jc2k | hmm | 11:07 |
| Jc2k | i can reproduce, at least :] | 11:07 |
| fullermd | Sheesh, get a room. | 11:08 |
| Lo-lan-do | I'm off to lunch, but I'll be back soon :-) | 11:12 |
| CaMason | hi guys. I've got an SVN repo with some projects in, and I'd like to create a bzr branch from one of the specific folders in that SVN repo | 11:53 |
| CaMason | any hints on how to do that? I tried bzr branch /srv/svn/myrepo/myclient/project/ but got an error about different rich-root support | 11:54 |
| fullermd | You're trying to branch it into an existing repository, which isn't rich-root capable. | 11:55 |
| fullermd | You need to do it into a new repository (standalone would quality), or change your existing repository to rich-root, which you probably don't want to do since it will shove all the branches in it through the trapdoor. | 11:56 |
| CaMason | what does the rich-root do? | 11:58 |
| Lo-lan-do | CaMason: I think it allows bzr to track information on the root directory, whereas non-rich-root formats only track it for the files inside. | 12:09 |
| Lo-lan-do | But I'm far from being an expert in these matters. | 12:10 |
| Lo-lan-do | Jc2k: Any timeframe for a working push? Weeks? Months? | 12:10 |
| fullermd | Roughly that, yah. | 12:11 |
| CaMason | ok. well, they way I have my folders set up is, I have a shared-repo (no trees) per client | 12:12 |
| CaMason | then there are project folders, then the branches inside of that | 12:12 |
| CaMason | either way, do I need to make a shared repo with rich root support | 12:13 |
| fullermd | Well, you could make a separate shared repo for it, sure. Or you could just make it standalone. | 12:13 |
| CaMason | there's no branches in that particular repo atm | 12:14 |
| fullermd | (probably have to make it elsewhere then move it in place for that; there's no easy way offhand I know of to make it standalone from the start without doing a lot more rather annoying steps along the way) | 12:14 |
| Lo-lan-do | Jc2k: By the way, I upgraded the git plugin (and installed dulwich) and the bug seems to have gone away. | 12:15 |
| CaMason | will rich-root cause me any problems with normal bazaar projects? (or other cons?) | 12:15 |
| Jc2k | Lo-lan-do: interesting.. | 12:16 |
| Jc2k | Lo-lan-do: im just merging head into my branch so i guess it will go away for me in a sec to | 12:16 |
| Jc2k | too | 12:16 |
| Lo-lan-do | Well, since I'm tracking your branch.... | 12:18 |
| Lo-lan-do | I was hopeful when I saw a log message by jelmer stating "Let's implement push", but no such luck. | 12:18 |
| Jc2k | that was me in dulwich | 12:19 |
| Lo-lan-do | Oh, right, sorry. | 12:19 |
| Jc2k | in theory dulwich would support push right now, but the stuff to assemble a push is missing for a git repo and for a bzr repo | 12:19 |
| Jc2k | i was working a git implementation in dulwich to make sure the API is up to scratch, then i was going to start on the bzr one. assuming jelmer doesnt beat me to that :) | 12:20 |
| oleavr | hi. is there an easy way to replace the parent location for a number of branches? like, some way to clear it off a branch and specify it in locations.conf | 12:25 |
| Jc2k | hey oleavr :) | 12:26 |
| oleavr | morn Jc2k :) how's it going? | 12:27 |
| Jc2k | goood thx :) yourself? | 12:28 |
| james_w | oleavr: http://theironlion.net/blog/2009/01/13/using-bazaar-launchpad-making-pushing-easy/ | 12:28 |
| james_w | check the bit there about configuring locations | 12:28 |
| fullermd | CaMason: Rich root support is a trapdoor. Revisions made with rich root support can't be used in non-rich-root repositories. So you don't want to move any branch of a project into rich-root unless you're prepared to move EVERY branch of that project (anywhere) into rich root. | 12:29 |
| oleavr | Jc2k: nice :) pretty good. what are you hacking on these days? | 12:31 |
| oleavr | james_w: thanks, but I've tried that already.. 'bzr pull' still pulls from the parent location ('Using saved parent location') | 12:32 |
| oleavr | james_w: so I need some way to clear that remembered value so the one in locations.conf gets used | 12:32 |
| Jc2k | oleavr: i've been toying with bzr-git lately (wrote a git server than stores its stuff in bzr) | 12:33 |
| Jc2k | oleavr: reading branch.py, looks like there should be a parent file in the .bzr dir for your branch | 12:34 |
| oleavr | Jc2k: awesome! asabil told me about that project. sounds really neat! | 12:34 |
| fullermd | Only if you have a very old branch. | 12:35 |
| oleavr | Jc2k: aha, thanks! *looks* | 12:35 |
| Jc2k | otherwise it goes through the normal config stuff | 12:35 |
| Jc2k | and i guess there would be a branch.conf too | 12:35 |
| Jc2k | /instead/ | 12:35 |
| oleavr | hmm, branch.conf seems to be the culprit | 12:35 |
| Jc2k | it looks like you can branch.set_parent_location(None) to unset it | 12:37 |
| Lo-lan-do | Jc2k: Could the git server be installed as /usr/bin/git, for remote usage through ssh? | 12:37 |
| oleavr | yay, simply just setting parent_location in locations.conf did the trick (thought I tried that already) | 12:37 |
| Jc2k | ah, good. | 12:37 |
| Jc2k | Lo-lan-do: bzr-git ships with bzr-receive-pack and bzr-upload-pack scripts to symlink in place of git-receive-pack and git-upload-pack | 12:38 |
| Lo-lan-do | Lovely. Do they already work? That would really make my day :-) | 12:39 |
| Jc2k | theoretically :) | 12:40 |
| * Lo-lan-do gives it a try | 12:40 | |
| Jc2k | but the mappings need more love before it can handle bzr revisions | 12:40 |
| Jc2k | atm it can only handle git revisions | 12:41 |
| Jc2k | (its easy to get a sha1 off a git revision, but to get it off the bzr revision i'd have to scan the entire history of that revision) | 12:41 |
| Lo-lan-do | Oh, so git→bzr one-way again :-/ | 12:42 |
| Jc2k | yeah. | 12:42 |
| Lo-lan-do | I'm almost to the point where I'd like to say "We're using bzr. Deal with it." | 12:44 |
| Lo-lan-do | Problem is that there are three of us, one a bzr user, one a git user, and one who doesn't care. And I don't have any particular moral authority to impose bzr. | 12:45 |
| Jc2k | both should work real soon. | 12:45 |
| Lo-lan-do | Nice to know, because we're on a wobbly standing currently, without any public SCM so far. | 12:46 |
| CaMason | is there any way I can make an SVN repo into a bzr branch without rich-root support? | 13:10 |
| Lo-lan-do | I don't think so. | 13:12 |
| fullermd | Not with bzr-svn anyway; it uses rich roots. | 13:14 |
| CaMason | not that.. I want to migrate this svn repo branch to a bzr branch | 13:15 |
| CaMason | so I can leave SVN behind | 13:15 |
| james_w | try bzr-fastimport | 13:15 |
| CaMason | just reading up about that now | 13:16 |
| CaMason | is it a plugin? The docs just say "grab the latest source" | 13:17 |
| CaMason | seems so | 13:19 |
| james_w | yeah, you can "bzr branch lp:bzr-fastimport ~/.bazaar/plugins/fastimport" | 13:22 |
| CaMason | I can't see any docs on how to use it properly. I'd need to filter the repo as I only want one of the folders inside of it | 13:23 |
| james_w | well, it has two parts | 13:25 |
| james_w | svn-fast-export that exports the SVN repo to a text stream | 13:25 |
| james_w | and then bzr fast-import that imports that stream in to a bzr branch | 13:25 |
| james_w | you can edit that stream in the middle if you like | 13:25 |
| CaMason | ah right | 13:26 |
| james_w | bzr help fastimport | 13:26 |
| james_w | may give some documentation | 13:26 |
| CaMason | yes it does, but it says to check on the web for further docs, which don't exist | 13:26 |
| CaMason | I assume fast-import-filter would be helpful though | 13:27 |
| CaMason | would be good to try exporting to a file first then. I'll see if I can figure how to use fast-export-filter.py | 13:30 |
| james_w | yup | 13:30 |
| CaMason | fast-export.py sorry | 13:30 |
| CaMason | ok I'm getting there. Getting an error that I'm looking up | 13:42 |
| CaMason | "Can't open file '/srv/svn/clients/db/revs/154': too many open files" | 13:44 |
| jelmer | CaMason, what is the problem with rich roots? | 13:48 |
| CaMason | I don't know, I was told it was a 'trap door'. All I would like to do is create a sole-branch out of a folder in an SVN repo, and keep it as an SVN branch | 13:49 |
| jelmer | CaMason, that's correct - you can't downgrade from rich root to the current default format, but rich root will be the default format at some point in the future | 13:51 |
| CaMason | oh right | 13:51 |
| CaMason | well this bzr repo is empty at the moment, so could I just re-create it as rich-root, then do a bzr-svn branch into there? | 13:52 |
| jelmer | yep | 13:53 |
| * CaMason tries that | 13:55 | |
| * Lo-lan-do cries | 13:59 | |
| Lo-lan-do | You can track a git branch in bzr with bzr-git, and a bzr branch in git with git-bzr, but when you do a round-trip the revision-ids are different so the branches have no common history :-( | 14:00 |
| jelmer | yes, the two are incompatible | 14:01 |
| CaMason | jelmer: thanks for that, I seem to have imported my svn branch successfully :) | 14:03 |
| CaMason | and it's now a bona-fide bzr project | 14:03 |
| CaMason | no more .svn pollution :) | 14:06 |
| Lo-lan-do | And your working copy is smaller while containing your whole history. | 14:07 |
| CaMason | the main thing is I can now work on this project whilst on the train :) | 14:08 |
| CaMason | and I love that about bzr | 14:08 |
| CaMason | svn died on me twice this-morning when I deleted a file manually. It hates that | 14:09 |
| Lo-lan-do | jelmer: Is that something that can be fixed with the push support in bzr-git, or will stuff be forever split? | 14:14 |
| rkistner | i'm having trouble with a lock | 14:16 |
| rkistner | when i try to push my branch to launchpad, i get the error "Unable to obtain lock lp-46722000:///~ralf-kistner/pidgin-mxit/main/.bzr/branch/lock" | 14:16 |
| rkistner | locked 67 hours, 23 minutes ago | 14:16 |
| Jc2k | Lo-lan-do: bzr-git will eventually have full two-way support, introducing git-bzr is always going to introduce pain tho.. unless we have some kind of 'bzr upgrade' to fix a git-bzr branch.. | 14:17 |
| rkistner | but when i try to break the lock with "bzr break-lock lp-46722000:///~ralf-kistner/pidgin-mxit/main/.bzr/branch/lock" | 14:17 |
| Jc2k | Lo-lan-do: i dont know enough about git-bzr, though | 14:17 |
| rkistner | i get the error Could not acquire lock "(remote lock)" | 14:17 |
| Jc2k | rkistner: thats a known bug with the error message (fixed recently i think) | 14:17 |
| rkistner | ok | 14:18 |
| Jc2k | rkistner: i think you want bzr break-lock lp:~ralk-kistner/pidgin-mxit/main | 14:18 |
| rkistner | thanks, that worked | 14:19 |
| rkistner | what would cause the lock in the first place? | 14:19 |
| Jc2k | a write operation that was interrupted | 14:19 |
| Jc2k | (i think, not my area of expertise tbh) | 14:20 |
| Lo-lan-do | Jc2k: Great, thanks :-) | 14:20 |
| jelmer | svn-upgrade has some code that could be factored out to supported rebasing a git-bzr-based branch on a bzr-git based branch | 14:22 |
| Lo-lan-do | Next question... can one (or will one be able to) access other branches than "master" with bzr-git? | 14:24 |
| jelmer | Lo-lan-do, not yet, for this colocated branches in bzr would have to be supported first | 14:24 |
| jelmer | I sent a spec for this to the mailing list a while ago | 14:25 |
| Jc2k | Lo-lan-do: the server part can expose multiple branches, tho | 14:25 |
| Lo-lan-do | jelmer: Interesting | 14:34 |
| Goosey | Hello, I am helping to solve [Bug 320968] and was asked to do "bzr init -Dtransport" to write a ".bzr.log". I did this but I do not see the log file. Am I doing anything wrong? | 15:18 |
| ubottu | Launchpad bug 320968 in bzr-svn "bzr init in the base of a subversion checkout crashes" [Undecided,New] https://launchpad.net/bugs/320968 | 15:18 |
| jelmer | Goosey, bzr will always be writing this file (every time it runs) but I'm not sure where it's located on Windows | 15:19 |
| jelmer | on Linux it's in your homedir | 15:19 |
| Goosey | Ah ok, i will look where it may be.. | 15:19 |
| james_w | "bzr version" tells you I thin | 15:19 |
| Goosey | yes it does | 15:20 |
| Goosey | i have it, thanks :) | 15:20 |
| speakman | My bzr is saying "No handlers could be found for logger "bzr"" all the time. Any changes lately? | 15:46 |
| Odd_Bloke | speakman: Do you get it with '--no-plugins'? | 15:46 |
| speakman | yep | 15:47 |
| rbriggsatuiowa | how do I change the push branch in bzr info? | 15:47 |
| Odd_Bloke | speakman: I have no further thoughts on the matter. :p Someone else'll know what's up. | 15:48 |
| speakman | rbriggsatuiowa: bzr push --remember sftp://new.place.com/somewhere ? | 15:48 |
| speakman | Odd_Bloke: ok, thanks for trying. This is really annoying though :) | 15:48 |
| speakman | This = It's | 15:48 |
| speakman | it's also very verbose, showing every output twice and one of them with both pid, timestamp and debug level: | 15:51 |
| speakman | [12133] 2009-01-26 16:49:42.154 INFO: added src/pkt.c | 15:51 |
| speakman | added src/pkt.c | 15:51 |
| rbriggsatuiowa | speakman: thanks | 15:53 |
| speakman | Odd_Bloke: rm -f ~/.bzr.log* did it | 15:53 |
| Odd_Bloke | speakman: Weird. Possibly worth filing a bug. | 15:54 |
| speakman | there already are a few regarding the same issue, that's where I found the solution. :) | 16:00 |
| Odd_Bloke | speakman: Fair enough. :) | 16:03 |
| === dereine[OFF] is now known as dereine | ||
| Ng | in the output of bzr info, what's a submit branch? | 16:35 |
| beuno | Ng, where "bzr send" will compare against | 16:40 |
| Ng | beuno: has it appeared because I merged at some point? I've never seen it before and never used send | 16:40 |
| beuno | Ng, yeah, it's usually where you branch from IIRC | 16:40 |
| NfNitLoop | yeah, that one confuses me too. | 16:41 |
| Ng | fair enough. I tend to merge from branches that only exist for short periods, which is what I found a little confusing | 16:42 |
| * Lo-lan-do loves the new branch aliases | 16:42 | |
| NfNitLoop | ... branch aliases? | 16:42 |
| Lo-lan-do | :bound, :parent and :push | 16:42 |
| NfNitLoop | oh, handy. can we make custom ones? :) | 16:42 |
| Ng | beuno: thanks :) | 16:42 |
| Lo-lan-do | No idea, and they're not even particularly documented anyway. | 16:43 |
| Lo-lan-do | But I like to be able to "bzr missing :bound". | 16:43 |
| luks | NfNitLoop: no, but there is https://launchpad.net/bzr-bookmarks | 16:54 |
| === _thumper_ is now known as thumper | ||
| fullermd | Wuff. Unshelve sure doesn't like the new progress bar stuff... | 17:57 |
| aruetten | hello everybody, sorry if now follows a boring question. I got a branch of a projekt from launchpad by using bzr lp:/<project_name> and I did some changes in there. What is the right way to commit my changes for my personaly and not to copy them back to LP? | 18:06 |
| luks | bzr commit | 18:07 |
| aruetten | so simple? ok and when i want to put my changes up to LP bzr push will be the right? | 18:08 |
| luks | right | 18:08 |
| aruetten | thanks | 18:08 |
| ollie | one thing about bzr that is really buggy me. I want a config file to exist in my repository but I need it to be ignored when i do a checkout as the settings are local | 18:09 |
| luks | does *any* VCS have a solution to that? | 18:09 |
| ollie | so when a new developer does a checkout they need to get the config file but then when they edit the config file it needs to be ignored | 18:10 |
| luks | what I normally do is version the default version of a config file | 18:10 |
| luks | and the developer has to copy/modify it | 18:10 |
| ollie | yeah | 18:15 |
| ollie | but i can't ignore a versioned file | 18:15 |
| ollie | and then when a do bzr up i get conflicts | 18:15 |
| luks | ollie: no, I meant that you version foo.conf.default and ignore foo.conf | 18:16 |
| ollie | oh i see right that makes sense | 18:17 |
| ollie | thanks :) | 18:17 |
| === dereine is now known as dereine[OFF] | ||
| === dereine[OFF] is now known as dereine | ||
| LarstiQ | hmm, no bialix | 19:21 |
| === jfroy|work_ is now known as ghost | ||
| === ghost is now known as Guest14946 | ||
| === Guest14946 is now known as jfroy|work | ||
| Goosey | jelmer, ping! | 20:03 |
| jelmer | Goosey, pong | 20:03 |
| Goosey | jelmer, I figured IRC may be more rapid than the buglog whenever you are interested (ref to #320968) | 20:04 |
| jelmer | Goosey, yeah | 20:05 |
| * Lo-lan-do discovers bzr-email | 20:10 | |
| * Lo-lan-do discovers bzr-cia too | 20:11 | |
| jelmer | :-) | 20:11 |
| jelmer | Goosey, Did you see my last reply? | 20:11 |
| Lo-lan-do | jelmer: You should make a bzr-allplugins package, it'll make life simpler for everyone :-) | 20:11 |
| jelmer | Lo-lan-do, bzr-cia is already packaged | 20:11 |
| Goosey | jelmer, last reply from you I have is your request for the -xml logs on the smaller revision set | 20:12 |
| Lo-lan-do | I think you mean bzr-email... I just aptitude-installed -email, but rmadison doesn't mention -cia. | 20:12 |
| Goosey | jelmer, I made a reply to that, but as I said in my reply I don't think I can share those log files directly due to NDA | 20:12 |
| jelmer | Lo-lan-do, it's in cia-clients | 20:13 |
| jelmer | Lo-lan-do, along with the git/svn/etc CIA plugins | 20:13 |
| Lo-lan-do | Oh, sorry. | 20:14 |
| jelmer | Goosey, I'm not sure what's going wrong exactly | 20:21 |
| jelmer | Goosey, it looks like a bug in subversion, but I can't really tell | 20:22 |
| jelmer | Goosey, are the subversion you're using directly and the one bzr-svn uses the same? | 20:22 |
| === kiko is now known as kiko-afk | ||
| Goosey | jelmer, the same repository, you mean? | 20:22 |
| jelmer | Goosey, no, the instance of the subversion libraries that's being used | 20:23 |
| Goosey | jelmer, I am not sure about that. I am using the precompiled 1.11 windows binaries for the bzr-svn side, do you know I command I can use to query the svn version? | 20:24 |
| jelmer | Goosey, bzr-svn will report it in the .bzr.log file | 20:24 |
| Goosey | jelmer, bzr-svn: using Subversion 1.5. and.. 1.5.5 for my direct SVN client | 20:28 |
| jelmer | Goosey, what's the minor version of the svn used by bzr-svn ? | 20:32 |
| jelmer | it should print 3 digits | 20:33 |
| Goosey | jelmer, ah sorry, 1.5.4 | 20:33 |
| lifeless | moin | 21:13 |
| LarstiQ | moin lifeless | 21:16 |
| === fta_ is now known as fta | ||
| lifeless | jelmer: ping | 21:26 |
| jelmer | lifeless, pong | 21:27 |
| lifeless | jelmer: dulwich isn't reconstructing texts quite right for me | 21:27 |
| jelmer | oh? | 21:27 |
| lifeless | jelmer: in bzr-compressbench | 21:27 |
| lifeless | jelmer: http://bazaar.launchpad.net/~lifeless/+junk/bzr-compressbench | 21:27 |
| lifeless | grab that | 21:27 |
| lifeless | its got a _very_ minimal versionedfiles implementation for dulwich | 21:28 |
| lifeless | I take a pack repo, fully pack it | 21:28 |
| lifeless | then construct a dulwich.pack.Pack on that pack | 21:28 |
| lifeless | I can get out a plain text | 21:28 |
| lifeless | and maybe a two-or-three delta (not sure where it breaks), but doing a full benchmark run EFAIL | 21:29 |
| jelmer | and this works ok using e.g. git itself? | 21:29 |
| lifeless | yes | 21:29 |
| lifeless | the dulwich VF is subclasses from a 'invoke git as a subprocess' VF | 21:30 |
| lifeless | have a look at the code, its pretty straight forward, and in true benchmark style no tests :P | 21:30 |
| jelmer | What sort of failure do you get? | 21:30 |
| lifeless | keyerror I think | 21:30 |
| lifeless | grab the code, edit the repo reference, run --delta git --delta dulwich --limit 100000000 | 21:31 |
| lifeless | and you'll see | 21:31 |
| lifeless | back shortly, eating | 21:31 |
| jelmer | lifeless, runs fine so far | 21:50 |
| lifeless | jelmer: garh | 21:52 |
| lifeless | jelmer: in which case, you can see how you stack up speed wise :) | 21:52 |
| jelmer | lifeless, yeah, that bit is useful - thanks :-) | 21:52 |
| lifeless | I use git for the compression because I want to see how big it is | 21:53 |
| lifeless | but the git decompression has fork and datastructure warmup overheads, so I wanted to see 'native' decompression and see if it was faster | 21:53 |
| igc1 | morning | 21:57 |
| === igc1 is now known as igc | ||
| hsn_ | i am geting error: Unable to load bzr-svn extensions - did you build it? - bzr1.11 on windows using python installer | 22:03 |
| jelmer | hsn_, did you install bzr-svn manually ? | 22:04 |
| hsn_ | jelmer: no. i deleted python and reinstalled python and bazaar again, its fresh install | 22:04 |
| hsn_ | there is directory sitepackages\bzrlib\plugins\svn - should i delete it? | 22:07 |
| hsn_ | deleting svn directory fixed problem | 22:09 |
| Goosey | jelmer, my repo seems to be cursed. I was messing with Mercurial and after 'hg init' 'hg add' 'hg status' on the root my checkout my montitor started flashing to black | 22:39 |
| Goosey | it is as if a demon was angered. A digital demon. | 22:39 |
| jelmer | Goosey, the only thing I can think of that would explain this is if the svn folks fixed a bug in svn 1.5.5 | 22:41 |
| LarstiQ | can anyone read http://www.ukr.net/mta/err.html#enduser?62.216.7.157 ? | 22:45 |
| * LarstiQ has trouble mailing bialix :( | 22:45 | |
| jelmer | LarstiQ, Yes | 22:45 |
| jelmer | LarstiQ, it's Ukranian :-P | 22:46 |
| LarstiQ | jelmer: :P | 22:46 |
| LarstiQ | jelmer: so what does it tell me to do mail bialix? hmm? | 22:46 |
| jelmer | LarstiQ, he was asking around for you here this morning I think | 22:46 |
| LarstiQ | yeah, I noticed, but he wasn't here when I got back | 22:46 |
| jelmer | LarstiQ, have you tried google translate? | 22:46 |
| LarstiQ | jelmer: he emailed me too | 22:46 |
| _mathrick | hiya | 22:46 |
| jelmer | hi _mathrick | 22:47 |
| LarstiQ | jelmer: oooh, it does Ukrainian | 22:47 |
| _mathrick | a buglet I just noticed: bzr get bzr+ssh://path/to/a/lightweight-checkout fails because it refers to the parent branch as a plain pathname, which is then interpreted locally | 22:47 |
| _mathrick | known? | 22:48 |
| LarstiQ | jelmer: aha, it doesn't like my reverse dns | 22:48 |
| * LarstiQ sent a message via launchpad and hopes that gets delivered | 22:53 | |
| LarstiQ | and now, to bed | 22:53 |
| jfroy|work | jelmer: quick update on 0.5, no explosions so far. still watching my steps, but it is promising | 22:53 |
| LarstiQ | jelmer: can I provide more info on bug 320113? | 22:55 |
| ubottu | Launchpad bug 320113 in bzr-svn "svn-upgrade fails with a KeyError (in rebase generate_transpose_plan)" [Undecided,New] https://launchpad.net/bugs/320113 | 22:55 |
| jelmer | of course :-) | 22:55 |
| * LarstiQ rephrases | 22:55 | |
| LarstiQ | jelmer: what needs to happen to move it forward? :) | 22:55 |
| jfroy|work | LarstiQ: hum, does one need to run that command when moving to 0.5? | 22:59 |
| jelmer | LarstiQ, is there any reason you're using svn-upgrade at all rather than just doing a clean branch ? | 23:00 |
| jelmer | svn-upgrade should only be necessary for branches that are not yet in svn | 23:00 |
| LarstiQ | jfroy|work: not per se | 23:02 |
| LarstiQ | jfroy|work: but I want to use the new mappings, and branches based on the old ones don't interact with new ones. Which is very nice in that I can (and already do) have some branches be 0.5 based without biting other 0.4 based ones. | 23:03 |
| LarstiQ | jfroy|work: however, I'd like to switch some current 0.4 ones if possible, other options would be removing them all, and just branching again | 23:04 |
| jelmer | LarstiQ, ah, that makes sense | 23:04 |
| jelmer | I hadn't considered that use case | 23:04 |
| LarstiQ | jelmer: which use case? | 23:05 |
| lifeless | jelmer: so it works without crashing for ou | 23:05 |
| lifeless | you? | 23:06 |
| * _mathrick regrets there's no way to branch only the history concerning specific files | 23:06 | |
| jfroy|work | So it is actually possible to concurrently use 0.4 and 0.5 on the same svn repository? I assume as long as the same "branch" is not accessed with both. | 23:06 |
| LarstiQ | jfroy|work: yes, no | 23:06 |
| asabil | hi all | 23:06 |
| LarstiQ | jfroy|work: I use 0.5 and 0.4 for different 'branches' in svn, that works fine. | 23:06 |
| LarstiQ | jfroy|work: I've also used 0.4 and 0.5 on the same branch, that also works. | 23:06 |
| jfroy|work | LarstiQ: :o | 23:06 |
| asabil | I am writing a plugin that involves iterating over all the "commits" from an input branch, and reapplying them on another output branch | 23:06 |
| jfroy|work | jelmer: tip of the hat | 23:06 |
| jfroy|work | I was worried about that. | 23:07 |
| LarstiQ | jfroy|work: but then gets me into 320113 if I try to svn-upgrade a 0.4 one | 23:07 |
| lifeless | asabil: isn't that rebase? | 23:07 |
| asabil | I amnot very familiar with the bzr internals, can someone point me to a starting point please ? | 23:07 |
| asabil | lifeless: not really, I want to rewrite the whole branch | 23:07 |
| LarstiQ | jfroy|work: what you can not do, is communicate between the 0.5 and 0.4 branches directly with bzr. The communication has to go through svn. | 23:07 |
| lifeless | asabil: yes, replay (in the rebase plugin) can do that | 23:07 |
| asabil | I need to get access to the commit data | 23:08 |
| jfroy|work | LarstiQ: right, because they likely will have divergent histories | 23:08 |
| asabil | like the commit message and the state of the tree | 23:08 |
| LarstiQ | jelmer: so the reason I'd like svn-upgrade, is that I don't know what my colleagues have done, and telling them to 'bzr svn-upgrade' would be easier than trying to manage it in a different way. | 23:08 |
| LarstiQ | jfroy|work: yup, their revisions are always different. | 23:09 |
| lifeless | asabil: anyhow, I'd look at the rebase code; or the graft code | 23:09 |
| asabil | ok thanks | 23:10 |
| lifeless | asabil: historic data is available via repository.revision_tree() and repository.get_revision() | 23:10 |
| asabil | okidoki | 23:10 |
| alf | hello all, as I was browsing the bugs I stumbled on bug #318604 | 23:12 |
| ubottu | Launchpad bug 318604 in bzr ""bzr diff" after "bzr push" does not display changes" [Undecided,New] https://launchpad.net/bugs/318604 | 23:12 |
| alf | and I got really confused about what is happening | 23:12 |
| _mathrick | mathrick@hatsumi:~$ bzr st .emacs | 23:12 |
| _mathrick | bzr: ERROR: .emacs is not in the same branch as .emacs | 23:12 |
| _mathrick | what? | 23:12 |
| _mathrick | I got this after bzr failed mid-commit due to dbus plugin failing | 23:13 |
| LarstiQ | _mathrick: dbus failing, luckily, is post-commit | 23:13 |
| LarstiQ | _mathrick: but it is a very sucky failure mode | 23:13 |
| _mathrick | it still managed to bork my repo | 23:13 |
| alf | the answers seem to find the bug invalid but I don't understand why is this | 23:13 |
| LarstiQ | _mathrick: your working tree might be out of date | 23:13 |
| LarstiQ | _mathrick: at least, this is from my experience | 23:14 |
| _mathrick | LarstiQ: no, I updated it after it told me to | 23:14 |
| LarstiQ | _mathrick: ah, bah | 23:14 |
| lifeless | _mathrick: thats interesting | 23:14 |
| lifeless | _mathrick: the stage it fails at is after the commit, before the update | 23:14 |
| lifeless | _mathrick: so just 'bzr update' should unwedge things | 23:14 |
| _mathrick | lifeless: I already did | 23:14 |
| _mathrick | that came *after* the up | 23:14 |
| lifeless | _mathrick: is .emacs a subdir ? | 23:15 |
| lifeless | or a symlink? | 23:15 |
| _mathrick | no | 23:15 |
| _mathrick | yes | 23:15 |
| _mathrick | oh, right | 23:15 |
| lifeless | alf: what are you trying to do? | 23:16 |
| asabil | anyone here able to branch the graft plugin ? | 23:18 |
| alf | lifeless: the bug as I understand it is: have branch X on machine A, make a copy of it (eg bzr branch) on machine B | 23:18 |
| alf | lifeless: change/commit something in A and push the changes to branch on machine B | 23:19 |
| LarstiQ | asabil: I do know the graft code has bitrotted | 23:20 |
| alf | lifeless: if after push the user enters "bzr diff" in the branch on machine B nothing is printed | 23:20 |
| lifeless | alf: thats normal | 23:20 |
| asabil | LarstiQ: yes probably, but this looks to me like a bzr.dev bug | 23:20 |
| lifeless | alf: 'diff' shows the current changes made in the tree - and no changes have been made on machine B | 23:20 |
| asabil | BzrDir.sprout is called with an invalid keyword argument | 23:20 |
| lifeless | alf: I believe 'bzr st' will tell you that the tree is out of date and should be updated | 23:21 |
| LarstiQ | asabil: TypeError: sprout() got an unexpected keyword argument 'source_branch' | 23:21 |
| asabil | yes | 23:21 |
| asabil | same issue here | 23:21 |
| * LarstiQ goes to bed | 23:22 | |
| alf | lifeless: is 'tree' something different from the set of files that are in the working directory? | 23:22 |
| lifeless | asabil: pastebin it ? | 23:22 |
| jelmer | LarstiQ, sorry | 23:22 |
| jelmer | LarstiQ, I need to look into this code again, it's been a while | 23:22 |
| lifeless | alf: its that set yes | 23:22 |
| jelmer | LarstiQ, I'll get back to you | 23:22 |
| lifeless | asabil: the full backtrace from ~/.bzr.log please | 23:22 |
| asabil | yep wait a second please | 23:23 |
| === dereine is now known as dereine[OFF] | ||
| LarstiQ | jelmer: thanks | 23:24 |
| asabil | lifeless: http://pastebin.com/d726b27c6 | 23:24 |
| asabil | removing the extra argument solves the problem btw | 23:25 |
| alf | lifeless: bzr diff shows the changes in the tree with respect to what? | 23:25 |
| lifeless | alf: to the basis tree | 23:25 |
| alf | lifeless: which is different from the branch tip? | 23:25 |
| lifeless | alf: it can be | 23:26 |
| lifeless | alf: the branch tip is the last commit made to the branch. working trees also know the last revision they were set to (and any pending merges done too) | 23:27 |
| lifeless | alf: the basis tree then, is the last revision the tree was set to - e.g. by 'commit' 'uncommit' 'pull' or 'push' - but the latter three operations can only change the tree when they are run locally, because remote operations introducing conflicts is bad | 23:28 |
| lifeless | so we don't alter working trees over the network | 23:29 |
| alf | lifeless: if I understood correctly the basis tree is stored as text (the tree contents) somewhere in .bzr/ , not only as a plain revision number | 23:35 |
| lifeless | asabil: I think its very old format bitrot, or possibly a plugin. I'll look deeper - but could you please file a bug | 23:36 |
| asabil | lifeless: sure, but the issue is obvious isn't it ? | 23:36 |
| lifeless | alf: the basis tree inventory is stored in .bzr/checkout, the file texts are stored in the repository (usually .bzr/repository) | 23:37 |
| asabil | lifeless: BzrDir.sprout () doesn't take the source_branch keyword argument, since it's the self | 23:37 |
| lifeless | asabil: I don't know what command line options you used for instance. Bug reports are good :). | 23:38 |
| lifeless | if you don't want to file a bug report, thats fine, I'll try to figure it out how to reproduce later. | 23:38 |
| === cody-somerville_ is now known as cody-somerville | ||
| lifeless | but if you could file one it is extremely helpful to capture the data | 23:39 |
| lifeless | as for the problem - the fix might be easy, but I needto track down - why didn't tests catch it, are there other old formats suffering the same issue, etc | 23:40 |
| asabil | lifeless: ok, done: bug #321695 | 23:43 |
| ubottu | Launchpad bug 321695 in bzr "bzr branch fails with "sprout() got an unexpected keyword argument 'source_branch'"" [Undecided,New] https://launchpad.net/bugs/321695 | 23:43 |
| lifeless | thanks! | 23:43 |
| asabil | yw | 23:43 |
| alf | lifeless: I can't understand why we can't change just the remote basis tree (.bzr/checkout not the working tree) when doing remote operations? | 23:54 |
| alf | lifeless: would that lead to any conflict? | 23:54 |
| lifeless | alf: it would mean that it no longer matched the content of the users tree | 23:54 |
| lifeless | alf: for a file F | 23:55 |
| lifeless | there is a current basis Fb, and there is the one in the tip Ft, and the one the user has been editing, Fu | 23:55 |
| lifeless | if the user has made changes, Fu != Fb | 23:56 |
| lifeless | if you tell the tree that Fb is now Ft, then the user will see changes from Fu to Ft, which conflates their intended edits with the changes from Fb to Ft | 23:56 |
| lifeless | this is bad because it makes it harder for them to accomodate the changes made by [Fb,Ft) in Fu | 23:57 |
| lifeless | much better to let them merge or revert at their own discretion | 23:57 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!