| jelmer | http://libwilliam.wordpress.com/2008/08/01/anjuta-bazaar-plugin-v010/ | 00:02 |
|---|---|---|
| lifeless | cool | 00:11 |
| Odd_Bloke | jam: Is it possible the branch you were having issues with is a loom? | 00:21 |
| jam | Odd_Bloke: no | 00:21 |
| jam | It happened *after* the process finished | 00:22 |
| jam | not at the beginning | 00:22 |
| jam | jelmer: he gave a lot of caveats and problems, but he didn't really say what it was supposed to do | 00:23 |
| jam | Is this the xml-rpc service? | 00:23 |
| jam | Or is it a different UI ? | 00:23 |
| jam | Ah, I guess anjunta is another IDE | 00:23 |
| jam | I hadn't heard of it before | 00:23 |
| jelmer | jam: yeah, it is | 00:23 |
| jelmer | it's a GTK+ based on | 00:23 |
| jelmer | e | 00:23 |
| Odd_Bloke | jam: Hmm, OK. No ideas remain. :) | 00:24 |
| jelmer | Why does TreeDelta have an unchanged field? | 01:52 |
| jelmer | It makes it very hard to implement an optimized version of it since knowing what was unchanged requires retrieving full contents rather than an actual delta :-( | 01:52 |
| lifeless | treedelta is very old | 01:53 |
| lifeless | I'd look at changing whatever needs it to not need it :) | 01:53 |
| markh | is there an - err - canonical version of bzr.png anywhere? | 03:40 |
| jelmer | markh, something like http://bazaar-vcs.org/LogoOptions ? | 03:41 |
| markh | jelmer: something very much like that - thanks! | 03:42 |
| markh | interesting - the copy of bzr.ico there is different than in bzr.dev - bzr.dev doesn't have a transparent background, which I was looking to "fix" | 03:43 |
| RAOF | Dear me, loggerhead looks _so_ _much_ better_. Good job! | 03:50 |
| evarlast | new loggerhead? | 04:06 |
| * evarlast updates | 04:06 | |
| Peng_ | evarlast: There isn't a new release, but the trunk is very nice. https://code.launchpad.net/~loggerhead-team/loggerhead/trunk | 04:38 |
| RAOF | I was just looking at the loggerhead on edge. | 04:39 |
| Peng_ | Is it just me, or could a bunch of the branches on https://code.launchpad.net/loggerhead be marked as Merged? | 04:43 |
| RAOF | bzr upgrade over sftp is not a lightning-fast operation. | 05:00 |
| RAOF | :( | 05:00 |
| RAOF | Thinking of which, would it be possible to have a nice big "upgrade this branch to $DEFAULT_FORMAT" button on launchpad? | 05:01 |
| Peng_ | I like that idea. I guess you should file a bug. | 05:05 |
| RAOF | What's codehosting's tracker? | 05:11 |
| Peng_ | I'd throw it in launchpad-bazaar, but I might be wrong. | 05:11 |
| Peng_ | Yeah, that sounds right. | 05:12 |
| rockstar | That is right | 05:14 |
| RAOF | bug #254135 filed. Feel free to comment/triage. | 05:31 |
| ubottu | Launchpad bug 254135 in launchpad-bazaar "Add UI to upgrade a hosted bzr branch" [Undecided,New] https://launchpad.net/bugs/254135 | 05:31 |
| ^mo | morning | 07:46 |
| ^mo | mornign | 07:58 |
| ^mo | uh | 07:58 |
| ^mo | morning :) | 07:58 |
| Odd_Bloke | ^mo: Morning. :) | 07:58 |
| ^mo | guys | 08:02 |
| ^mo | i am currently looking into misusing Bazaar (and other DRCS) | 08:02 |
| ^mo | the idea is to use a DRCS to backup and synchronize my files on multiple machines. mostly photos, binary documents (office), you name it. | 08:03 |
| ^mo | it's a shame there is no good dedicated tool to do that. so i thought about building one on top of a DRCS | 08:04 |
| ^mo | the idea is to monitor specified directories for changes, auto-commit them into a local repository, and auto-sync that to other repositories, either on my server or to other machines directly. | 08:05 |
| ^mo | so, i'm evalutating different DRCS for that | 08:08 |
| ^mo | unfortunately i seem to be the only one considering this "misuse" | 08:08 |
| weigon_ | ^mo: rsync is doing the big part of that | 08:49 |
| ^mo | but it doesn't do revisions, does it? | 08:54 |
| scorpioxy | hey guys. Quick question, is there something like merge --preview but for a heavyweight checkout? As in, preview the changes before updating. | 09:30 |
| === davi_ is now known as davi | ||
| lifeless | scorpioxy_: sorry no | 10:18 |
| lifeless | scorpioxy_: should be straight forward to do if you'd like to file a bug | 10:18 |
| scorpioxy_ | lifeless: so you think this is something that other people might want? My use case is for a looking at changes first instead of reverting later... | 10:44 |
| scorpioxy_ | lifeless: if you say that it is straight forward to do, then i'll try and implement it myself. | 10:46 |
| lifeless | scorpioxy_: /away | 10:49 |
| lifeless | scorpioxy_: I think its something that other folk might use yes | 10:49 |
| lifeless | and it makes sense to offer 'dry run' style things for commands where we can | 10:49 |
| lifeless | robtaylor: excellent | 10:49 |
| scorpioxy_ | lifeless: yes, i thought so too...thank you | 10:50 |
| RAOF | Hm. So, one of the problems with the crazy-long bzr upgrade-over-sftp process is that it appears that people can try to branch the repo while it's happening, and get not-particularly-helpful error messages for their trouble. | 10:53 |
| lifeless | RAOF: yes | 11:03 |
| RAOF | lifeless: Is there a bug already filed about that? | 11:04 |
| lifeless | RAOF: its kindof by design | 11:05 |
| lifeless | RAOF: I don't think there is an explicit bug; be worth having one | 11:05 |
| RAOF | Kindof by design that people can try to branch from a repo in the process of being upgraded? | 11:06 |
| lifeless | we don't have read locks on branch or repository | 11:06 |
| lifeless | nor a thing to check to see if someone is doing operations like reconcile/upgrade | 11:07 |
| gour | what's the ETA for 1.6? | 11:07 |
| lifeless | and we wouldn't want one that is costly/problematic | 11:07 |
| RAOF | Where are my CDs dissappearing to? Now I can't find Eternal Nightcap or White Blood Cells. Grr | 11:07 |
| RAOF | But a bug to sit around and track that it's a real problem isn't a bad thing. | 11:07 |
| lifeless | gour: soon; don't know exactly | 11:07 |
| RAOF | I've already filed a bug that, if implemented, would almost eliminate this problem - a Launchpad button for upgrade. | 11:08 |
| lifeless | RAOF: doesn't eliminate the problem at all | 11:08 |
| RAOF | No, but it makes it vastly less likely that someone will hit it. | 11:08 |
| lifeless | RAOF: not really | 11:09 |
| lifeless | RAOF: there are many people that host their own branches over sftp | 11:09 |
| RAOF | But they will often/mostly have shell access to the host box? | 11:09 |
| lifeless | RAOF: if they are hosting over sftp no | 11:10 |
| RAOF | It makes it vastly less likely that _I_ will hit it. | 11:10 |
| lifeless | well only you can assess that :) | 11:10 |
| lifeless | why are you hitting it? LP has a public mirror that should protect you from hitting it on other peoples branches | 11:10 |
| RAOF | It wasn't me who hit it, but I was upgrading the do trunk and someone tried to pull and got a missing revision error. | 11:11 |
| RAOF | Since the upgrade took somewhat in the order of an hour, there seems to be a nice big window for breakage. | 11:12 |
| RAOF | I can hunt down the exact error message if it'd be helpful. | 11:12 |
| lifeless | no | 11:13 |
| lifeless | upgrade is roughly | 11:13 |
| lifeless | backup | 11:13 |
| lifeless | delete the repository | 11:14 |
| lifeless | make a new one | 11:14 |
| lifeless | fetch from the backup | 11:14 |
| gour | ...so, bzr-svn will follow 1.6 shortly | 11:15 |
| lifeless | I don't know | 11:16 |
| gour | jelmer (is he the author) told so | 11:16 |
| gour | is there any 'bzr-idiom' for naming feature branches in shared repo for e.g. project 'prj' ? | 11:18 |
| lifeless | I don't understand the question | 11:19 |
| lifeless | a shared repo is just disk usage optimisation, doesn't change naming or anything | 11:21 |
| gour | right, but if I have shared repo for the project named 'prj' any idea how to name a branch based on 'prj' which reprsents work on certain feature/bug-fix etc. ? | 11:23 |
| lifeless | I'd name branches after the feature or bug fix | 11:26 |
| gour | without 'prj' in the name? | 11:26 |
| lifeless | entirely up to you | 11:26 |
| lifeless | but if you have the project name in the url already, its a bit redundant to have it in the branch basename as well | 11:27 |
| gour | it's a 'local' project - my study notes | 11:27 |
| gour | thanks for the input | 11:28 |
| lifeless | np | 11:30 |
| gour | just pulled latest code from your search plugin ;) | 11:30 |
| gour | lifeless: hmm, what's this - http://rafb.net/p/2UMbPn85.html | 11:32 |
| lifeless | that branch needs 1.6b4 | 11:33 |
| gour | when was 1.6b4 released? | 11:34 |
| gour | i built bzr from repo yesterday, r3596 | 11:34 |
| lifeless | you sure you are using that bzr? | 11:36 |
| lifeless | bzr 1.6b3 on python 2.5.2 (linux2) | 11:36 |
| lifeless | arguments: ['/usr/bin/bzr', 'index'] | 11:36 |
| gour | lifeless: see http://rafb.net/p/tbz8zT49.html | 11:37 |
| lifeless | that says 1.6b3 | 11:38 |
| gour | r3596 | 11:39 |
| lifeless | no | 11:40 |
| gour | hmm | 11:40 |
| lifeless | 3596 is after 1.6b4, you have not installed that | 11:40 |
| gour | built and installed yesterday | 11:41 |
| lifeless | clearly not! | 11:41 |
| lifeless | find the directory you have 3596 in | 11:41 |
| lifeless | run ./bzr --version | 11:41 |
| gour | [root@nitai gour]# ls -al /var/abs/local/gaur/bzr-bzr-3596-1-x86_64.pkg.tar.gz | 11:41 |
| gour | -rw-r--r-- 1 gour gour 4141984 2008-08-01 14:58 /var/abs/local/gaur/bzr-bzr-3596-1-x86_64.pkg.tar.gz | 11:41 |
| gour | i got nothing for ./bzr | 11:42 |
| gour | i'll remove that pkg and re-build | 11:44 |
| lifeless | robertc@lifeless-64:~/source/baz/bzr.dev$ ./bzr version --short | 11:48 |
| lifeless | 1.6b4 | 11:48 |
| lifeless | robertc@lifeless-64:~/source/baz/bzr.dev$ ./bzr revno | 11:48 |
| lifeless | 3596 | 11:48 |
| gour | re-built the package and now I get 1.6.b4 and same r3596...strange :-/ | 11:48 |
| gour | hmm, commiting one patch takes quite loooooong | 11:50 |
| gour | when i'm finished with the feature or bug-fix and merge changes into 'trunk', i can safely dismiss feature/bug-fix branches ? | 11:54 |
| james_w | yup | 11:57 |
| james_w | once it's merged the revisions are linked in to another branch, so you can delete the one that you created them in, without risk of losing them | 11:57 |
| gour | with darcs one had to be careful if some patch went 'out' and then it was rm-ed in another repo | 11:58 |
| gour | james_w: it looks someone listened and tried with newer bzr - http://hackage.haskell.org/trac/ghc/wiki/DarcsEvaluation?action=diff&version=59 | 12:00 |
| gour | ;) | 12:00 |
| james_w | well, that's an improvement | 12:00 |
| gour | right. i did not got any reply from JaffaCake after sending him some bzr-ad-info, but maybe he took a look | 12:02 |
| luks | still too slow to downloads 90MB of data | 12:02 |
| luks | *download | 12:02 |
| gour | having ghc switch from darcs will impact the whole haskell community. it may happen that the whole hackage.haskell.org will adopt something else | 12:03 |
| gour | based on that wiki page, it looks that cherry-picking is the major Cons of bzr | 12:03 |
| luks | that is what I don't understnad, because git and hg are no better in that area | 12:04 |
| gour | luks: have you seen that page? | 12:05 |
| luks | yes, somebody posted the link here a few days ago | 12:05 |
| gour | you can add (as guest) some more relevant info | 12:05 |
| luks | heh, no I won't :) | 12:06 |
| gour | why not? | 12:06 |
| gour | git/hg users do the same | 12:06 |
| luks | I just don't promote things, unless they are really good | 12:06 |
| gour | bzr isn't? | 12:07 |
| luks | I don't think so | 12:07 |
| gour | i'd say it is on the level of hg and being simpler/safer than git | 12:07 |
| luks | I'm not saying it's worse than git or hg, it's better IMO, but it's not "really good" | 12:08 |
| gour | well, that's not pragmatic...we have to live with what we have NOW | 12:08 |
| gour | and project are switching to new VCSs NOW, not sometime in the future | 12:08 |
| luks | I do live with what we have now, so I use bzr, but I'm not going to promote it :) | 12:08 |
| lifeless | you know | 12:09 |
| * gour promotes things which he uses NOW | 12:09 | |
| lifeless | that git - bzr difference is around about the size difference in groupcompress | 12:09 |
| gour | ...and i'm sure bzr will catch those performance issues to not be issues any longer | 12:10 |
| gour | anyway, here is the url for anyone inspired to add some objective info to it - http://hackage.haskell.org/trac/ghc/wiki/DarcsEvaluation | 12:11 |
| gour | guest/guest are credentials | 12:12 |
| rocky | jelmer: hey... when i bzr checkout a svn trunk, and make commits to it directly and then run bzr update, it pulls down the same commits i just made to be committed again | 14:57 |
| rocky | am i doing something wrong? | 14:57 |
| jelmer | rocky, that doesn't sound right | 14:58 |
| jelmer | what version of bzr, bzr-svn? | 14:58 |
| rocky | bzr 1.5 | 14:58 |
| rocky | lemme check bzr-svn | 14:58 |
| rocky | bzr-svn 0.4.10 | 14:59 |
| jelmer | rocky: Can you pastebin some example output of doing a commit and an update? | 15:00 |
| rocky | trying... | 15:02 |
| rocky | bzr commit's to svn are still very very slow | 15:02 |
| jelmer | that should be a fair bit better with 0.4.11 | 15:04 |
| rocky | jelmer: http://cluebin.appspot.com/pasted/561 | 15:04 |
| jelmer | rocky, how slow is slow? | 15:07 |
| jelmer | seconds, minutes? | 15:07 |
| rocky | well, to do that commit of that recurring item takes about 50sec or so | 15:07 |
| jelmer | wow, ok | 15:08 |
| jelmer | I'm trying to figure out what's going wrong | 15:09 |
| jelmer | give me a few minutes | 15:10 |
| jelmer | beuno, pin | 15:10 |
| jelmer | g | 15:10 |
| rocky | hehe, k | 15:19 |
| AnMaster | http://rafb.net/p/2SLT6g34.html <-- I get that traceback from bzr | 15:35 |
| AnMaster | what should I do | 15:35 |
| AnMaster | what I did was: | 15:35 |
| AnMaster | bzr rm util-linux-ng | 15:35 |
| AnMaster | then bzr st crash with that error | 15:36 |
| spiv | AnMaster: I think that error might be fixed in bzr.dev | 15:36 |
| AnMaster | spiv, well how do I get my repo working again | 15:37 |
| AnMaster | I need it working now | 15:37 |
| AnMaster | how can I restore it to working order | 15:37 |
| AnMaster | spiv, I need help with that! | 15:37 |
| AnMaster | spiv, how can I get the repo working again!? | 15:38 |
| spiv | AnMaster: so if you're comfortable running a copy of bzr.dev (just "bzr branch http://bazaar-vcs.org/bzr/bzr.dev", then run bzr from the bzr.dev directory), I'd try that. | 15:38 |
| AnMaster | spiv, is that the only way? | 15:38 |
| AnMaster | to restore the repo | 15:38 |
| spiv | AnMaster: your repo is fine, as is your branch | 15:38 |
| spiv | AnMaster: the only part that's having a problem is the workingtree | 15:39 |
| james_w | AnMaster: "mkdir util-linux-ng; bzr add util-linux-ng; bzr st; bzr rm util-linux-ng" fixes it I believe | 15:39 |
| AnMaster | james_w, not sure... | 15:39 |
| spiv | AnMaster: so another thing you can do is "bzr branch . ../new-copy" and resume work from that | 15:40 |
| AnMaster | it looks very strange now | 15:40 |
| AnMaster | http://rafb.net/p/ji2wT482.html | 15:40 |
| james_w | that is a bit odd | 15:40 |
| AnMaster | spiv, ah thanks that worked | 15:40 |
| spiv | Not really, "bzr add" adds new files. | 15:40 |
| spiv | If you want to restore old files, use "bzr revert" (or potentially bzr add --file-ids-from). | 15:41 |
| AnMaster | spiv, bzr revert did also crash | 15:41 |
| AnMaster | actually not crash first time: | 15:41 |
| AnMaster | bzr: ERROR: No such file: u'/home/anmaster/abs/standard-recompiled/util-linux-ng/cryptoloop-support.patch' | 15:41 |
| AnMaster | when I tried to revert | 15:41 |
| AnMaster | anyway branch worked | 15:42 |
| spiv | That's probably caused by the same bug, I'd guess. | 15:42 |
| spiv | AnMaster: that's good news | 15:42 |
| spiv | It's late here, so I'm off to bed. | 15:42 |
| spiv | AnMaster: please file a bug with that traceback and if possible information to help us reproduce | 15:42 |
| AnMaster | spiv, hm I got no idea how to reproduce, I can't even manage to reproduce myself | 15:43 |
| spiv | AnMaster: ok, just the traceback is fine then. | 15:43 |
| AnMaster | hm ok | 15:44 |
| AnMaster | spiv, bug tracker is on launchpad right? | 15:44 |
| spiv | AnMaster: I suspect we may already have that bug in our bug tracker (and possibly even have it fixed for the upcoming 1.6 release), but it's good to make sure we're not missing things. | 15:44 |
| spiv | Right. | 15:44 |
| AnMaster | hrrm then to figure out if it exists | 15:44 |
| spiv | (Especially bugs that are hard for non-experts to recover from!) | 15:44 |
| spiv | AnMaster: if you're not sure, if it takes too long to figure out if it's already report, just quickly file a new bug anyway. | 15:45 |
| AnMaster | you got a few with the same text "Could not find target parent in wt" but I got no clue if they have the same cause | 15:45 |
| spiv | AnMaster: it's quite easy to mark a bug as a duplicate, it's harder to take a bug report and say "oh and the 'me too' in comment 11 is actually a different bug that just looked similar" :) | 15:45 |
| AnMaster | actually I think I used normal (non-bzr) rm on some files that I did bzr add on but hadn't commited | 15:46 |
| AnMaster | then did bzr rm on the directory that I added and didn't commit | 15:46 |
| AnMaster | where those files were located | 15:46 |
| AnMaster | spiv, can you reproduce that way? | 15:46 |
| spiv | AnMaster: I'm sorry, I'm actually nodding off (it's past midnight here) | 15:47 |
| spiv | AnMaster: it sounds plausible, though | 15:47 |
| AnMaster | unable to reproduce that way | 15:47 |
| spiv | AnMaster: thanks for your patience, and I'm glad we got you going again. | 15:47 |
| * spiv -> bed | 15:47 | |
| AnMaster | ah no I need to commit after adding | 15:48 |
| AnMaster | then it crashes | 15:48 |
| AnMaster | https://bugs.launchpad.net/bzr/+bug/254220 | 15:52 |
| AnMaster | there | 15:52 |
| ubottu | Launchpad bug 254220 in bzr "Crash on rm on file, bzr rm on directory and then bzr st" [Undecided,New] | 15:52 |
| dwt | jelmer: You there? | 15:53 |
| jelmer | dwt, hi | 15:53 |
| dwt | Super. | 15:53 |
| dwt | I talked to you some days ago about bzr-svn always crashing on startup on my mashine | 15:53 |
| dwt | (mac, leopard, fink) | 15:53 |
| dwt | Well, I found the problem | 15:53 |
| dwt | (well one of the problems :) | 15:54 |
| dwt | But I'm not sure what the right way to fix it would be | 15:54 |
| dwt | The problem is, that on os x with fink | 15:54 |
| dwt | the subversion libraries are in /sw/lib/svn15 | 15:54 |
| dwt | instead of /usr/lib where setup.py is setup to expect them | 15:54 |
| dwt | (while the headers reside in /sw/include.... | 15:55 |
| dwt | ) | 15:55 |
| dwt | This caused setup.py to link against an old version in /usr/lib which caused the crash | 15:56 |
| dwt | (subversion 1.4 there) | 15:56 |
| jelmer | dwt, subversion 1.4 should work as well though | 15:57 |
| dwt | hm. | 15:57 |
| dwt | it used libapr in the latest version from fink though | 15:57 |
| dwt | maybe that was the reason for the crash then? | 15:57 |
| jelmer | dwt, yeah, I guess conflicting aprs may be a problem | 15:58 |
| dwt | What do you think would be the best solution to this problem? I'd rather use the fink installed libraries than the apple provieded (those ar always very old) | 16:00 |
| dwt | But looking at the setup.py (and me not knowing a lot about it) I see no simple way to just tell it to look at a specific point in my filesystem for it's libraries | 16:01 |
| dwt | and headers | 16:01 |
| jelmer | it will try to find the apr-config utility | 16:06 |
| jelmer | make sure the apr-config instance it should use is first in your $PATH | 16:06 |
| dwt | yeah, that works and is correctly overridden by fink | 16:06 |
| dwt | That doesn't work for subversion though | 16:07 |
| dwt | (or maybe I'm missing something) | 16:08 |
| jelmer | dwt, one sec, I'll add some magic for that | 16:12 |
| dwt | jelmer: cool! | 16:12 |
| dwt | jelmer: svn libraries are in /sw/lib/svn15, while headers are in /sw/include/subversion-1 | 16:12 |
| jelmer | I've added a SVN_PREFIX environment variable | 16:13 |
| jelmer | (0.4 branch of bzr-svn) | 16:13 |
| dwt | does that account for an (IMO dumb) name choice like svn15 for the library dir? | 16:13 |
| dwt | instead of just svn? | 16:13 |
| dwt | jelmer: well it almost works, just a small copy'n'past error | 16:19 |
| dwt | === modified file 'setup.py' | 16:20 |
| dwt | --- setup.py2008-08-02 15:12:53 +0000 | 16:20 |
| dwt | +++ setup.py2008-08-02 15:17:57 +0000 | 16:20 |
| dwt | @@ -95,8 +95,8 @@ | 16:20 |
| dwt | svn_prefix = basedir | 16:20 |
| dwt | break | 16:20 |
| dwt | if svn_prefix is not None: | 16:20 |
| dwt | - return ([os.path.join(basedir, "include/subversion-1")], | 16:20 |
| dwt | - [os.path.join(basedir, "lib")], []) | 16:20 |
| dwt | + return ([os.path.join(svn_prefix, "include/subversion-1")], | 16:20 |
| dwt | + [os.path.join(svn_prefix, "lib")], []) | 16:20 |
| dwt | raise Exception("Subversion development files not found. " | 16:20 |
| dwt | "Please set SVN_PREFIX environment variable. ") | 16:20 |
| dwt | 16:20 | |
| dwt | (I believe) | 16:20 |
| dwt | Other than that, I've just got to solve the problem of my package manager insisting to put the svn libraries in a folder called svn15 instead of just svn | 16:20 |
| jelmer | yep | 16:20 |
| jelmer | thanks | 16:20 |
| dwt | jelmer: I was able to build it by doing a second patch: | 16:27 |
| dwt | === modified file 'setup.py' | 16:27 |
| dwt | --- setup.py2008-08-02 15:20:48 +0000 | 16:27 |
| dwt | +++ setup.py2008-08-02 15:25:44 +0000 | 16:27 |
| dwt | @@ -96,7 +96,7 @@ | 16:27 |
| dwt | break | 16:27 |
| dwt | if svn_prefix is not None: | 16:27 |
| dwt | return ([os.path.join(svn_prefix, "include/subversion-1")], | 16:27 |
| dwt | - [os.path.join(svn_prefix, "lib")], []) | 16:28 |
| dwt | + [os.path.join(svn_prefix, "lib/svn15")], []) | 16:28 |
| dwt | raise Exception("Subversion development files not found. " | 16:28 |
| dwt | "Please set SVN_PREFIX environment variable. ") | 16:28 |
| dwt | 16:28 | |
| dwt | However I don't think that this could go into the repo | 16:28 |
| jelmer | yeah, indeed | 16:28 |
| dwt | What do you think would be the most 'not ugly' solution to this? | 16:29 |
| dwt | Another environment variable seems very wastefull | 16:29 |
| dwt | though I honestly don't know of any alternative | 16:29 |
| dwt | maybe having SVN_LIB_DIR and SVN_INCLUDE_DIR would be a bit better? | 16:29 |
| Pilky | Is bzr really the only VCS that lets you work over S/FTP? | 16:31 |
| bob2 | no | 16:34 |
| dwt | jelmer: Success! Now I get an exception in check_subversion_version() in __init__.py :) | 16:34 |
| jelmer | dwt: patches are welcome :-) | 16:34 |
| dwt | jelmer: :) I'm looking into it | 16:35 |
| dwt | regarding the setup.py | 16:35 |
| dwt | would you accept a patch with two environment variables that are preffered if set? | 16:35 |
| Pilky | bob2: which other VCSs support it? | 16:36 |
| dwt | jelmer: Do I need to run anything else besides make to build a fully functional svn plugin? | 16:39 |
| jelmer | dwt, no, that should be sufficient | 16:39 |
| dwt | because the error is that it cannot load the client module | 16:39 |
| dwt | ImportError: cannot import name client | 16:39 |
| jelmer | dwt, can you pastebin the full backtrace perhaps? | 16:40 |
| bob2 | Pilky: arch! | 16:40 |
| dwt | in __init__.py on line 98 | 16:40 |
| dwt | sure | 16:40 |
| dwt | any paste preffered? | 16:40 |
| jelmer | dwt, never mind, it was the line number I was after | 16:40 |
| dwt | :) | 16:40 |
| jelmer | dwt, make should've built a client.so or something in the bzr-svn directory | 16:40 |
| dwt | jelmer: well it did, and it also seems as if it is linked up correctly | 16:41 |
| dwt | dwt@dwcp ~/.bazaar/plugins/svn % ll client.so | 16:41 |
| dwt | -rwxrwxr-x 1 dwt dwt 196728 2 Aug 17:37 client.so* | 16:41 |
| dwt | dwt@dwcp ~/.bazaar/plugins/svn % otool -L client.so | 16:41 |
| dwt | client.so: | 16:41 |
| dwt | /sw/lib/svn15/libsvn_client-1.0.dylib (compatibility version 1.0.0, current version 1.0.0) | 16:41 |
| dwt | /sw/lib/svn15/libsvn_subr-1.0.dylib (compatibility version 1.0.0, current version 1.0.0) | 16:41 |
| dwt | /sw/lib/libapr-0.0.dylib (compatibility version 10.0.0, current version 10.12.0) | 16:41 |
| dwt | /usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0) | 16:41 |
| dwt | /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 111.1.1) | 16:41 |
| Pilky | bob2: ah, well it's still a surprisingly rare feature given how useful it is, I'm surprised more isn't made of it | 16:42 |
| jelmer | dwt, perhaps it's some MacOSX-specific feature :-( | 16:42 |
| jelmer | s/feature/problem/ | 16:42 |
| dwt | :) | 16:42 |
| dwt | lets, see | 16:43 |
| dwt | what is the easiest way to get pyton to give me a debugger at that point? (I'm still not very good at python myself sadly) | 16:43 |
| jelmer | not sure if you need a debugger here, probably just a python prompt | 16:45 |
| jelmer | you should be able to get one by simply running "python" | 16:46 |
| dwt | :) | 16:46 |
| rocky | jelmer: don't suppose you saw anything blatantly wrong with the paste i showed earlier? where it was recommitting the same thing? | 16:46 |
| jelmer | rocky, sorry, I got distracted while I was looking into that | 16:46 |
| jelmer | rocky, There's nothing obviously wrong | 16:47 |
| rocky | hehe | 16:47 |
| dwt | uhm... importing client.so from python directly works extremely fine. | 16:47 |
| jelmer | rocky, can you perhaps file a bug so it at least doesn't get forgotten? | 16:47 |
| rocky | right | 16:47 |
| jelmer | I still intend to have a look at it soon, since I presume this blocks you from actually using bzr-svn? | 16:48 |
| dwt | jelmer: trying from bzrlib.plugins.svn import client however gives an error | 16:48 |
| jelmer | dwt, you need to tell bzr to load its plugins first | 16:49 |
| dwt | -> the same that happens in the scrept | 16:49 |
| jelmer | e.g. "from bzrlib.plugin import load_plugins; load_plugins()" | 16:49 |
| dwt | I'l try | 16:49 |
| dwt | still the same error | 16:49 |
| dwt | well not really | 16:50 |
| dwt | interestingly if I try "from bzrlib.plugins.svn import client" | 16:50 |
| dwt | it goes through __init__.py | 16:50 |
| dwt | and dies there at the same line that it dies when loading the plugin in bzr | 16:50 |
| dwt | (that is line 98) | 16:51 |
| dwt | if I change that to drop the "from bzrlib.plugins.svn" | 16:51 |
| dwt | it works | 16:51 |
| dwt | (that is, it throws at a similar line further into the script | 16:52 |
| dwt | ) | 16:52 |
| dwt | jelmer: It seems it somehow doesn't think of itself as 'bzrlib.plugins.svn' | 16:53 |
| dwt | when being in place | 16:53 |
| dwt | jelmer: Do you have any idea why that might happen - or am I completely on the wrong ship here? | 17:05 |
| jelmer | dwt, No idea, sorry | 17:05 |
| dwt | :) Ah well. | 17:05 |
| jelmer | dwt, you could try removing the "bzrlib.plugins.svn." prefix everywhere it comes up | 17:05 |
| jelmer | since it should work as well with relative imports | 17:05 |
| jelmer | but I have no idea what's going on that's breaking it | 17:06 |
| dwt | just a second | 17:06 |
| dwt | same here | 17:06 |
| dwt | :) | 17:06 |
| kiorky | does anyone has knowledge about the bzr webserve plugin ? It seems to exist a branch wich support collections ala hgwebdir. Did anyone ever tried that ? | 17:08 |
| kiorky | i mean : https://code.launchpad.net/~fdivbug/bzr-webserve/collections | 17:09 |
| jelmer | kiorky, any particular reason you're looking into webserve rather than loggerhead? | 17:11 |
| kiorky | jelmer: publishing a bunch of repositories | 17:11 |
| jelmer | I don't think webserve is maintained very actively anymore | 17:11 |
| kiorky | ok | 17:11 |
| kiorky | jelmer: ha, i may be wrong with webserve usage | 17:12 |
| kiorky | jelmer: can i clone over "webserve" ? Because that is what i was thinking. | 17:12 |
| jelmer | kiorky, afaik not | 17:12 |
| kiorky | jelmer: to do something similar of hgwebdir | 17:12 |
| kiorky | jelmer: like http://hg.minitage.org | 17:13 |
| jelmer | kiorky, something like http://bzr-playground.gnome.org/? | 17:13 |
| kiorky | jelmer: To sum up, my goal is to achieve that, with bzr | 17:13 |
| jelmer | kiorky, it's probably worth asking the loggerhead developers about | 17:14 |
| kiorky | jelmer: yep | 17:14 |
| kiorky | jelmer: the page you gave me is a loggerhead thing, isnt it ? | 17:16 |
| jelmer | yeah | 17:16 |
| bob2 | is a hg "repository" along the lines of a bzr branch? | 17:18 |
| kiorky | jelmer: i cliked on a tag, to http://bzr-playground.gnome.org/gnome-doc-utils/trunk/, then i can branch that. What i want to ask: are the modules in the same repo or there are multiple repos ? | 17:18 |
| bob2 | nm | 17:18 |
| jelmer | kiorky, multiple repositories | 17:18 |
| kiorky | jelmer: so what i will have to do is to setup loggehead, isnt it ? :) | 17:19 |
| kiorky | jelmer: what i do not understand is the magic for "branching", its loggerhead but i did branch on it... What is the boilerplate between the real repo and loggerhead ? | 17:20 |
| jelmer | kiorky, sorry, I'm not following | 17:22 |
| kiorky | jelmer: i read the doc and answered to my question :p | 17:24 |
| kiorky | jelmer: if i have something like that: a/.bzr b/.bzr b/c/d/f/r/e/.bzr, a and b would be served without problems i think, but will e be served ? | 17:25 |
| jelmer | kiorky: If b/ is a branch, no. If it is just a shared repository, then e will be served | 17:26 |
| kiorky | jelmer: someone told me about the nested tree support | 17:28 |
| kiorky | jelmer: do you know if there is something usable or testable atm ? | 17:28 |
| jelmer | kiorky: there is experimental support for nested trees, not sure what branch it is in though | 17:29 |
| jelmer | LarstiQ: ping | 17:29 |
| bob2 | are you sure you wanted nested branches in your repository? | 17:29 |
| kiorky | i like tree organization | 17:29 |
| kiorky | i dont know how to do without nesting things | 17:30 |
| bob2 | eh? | 17:30 |
| bob2 | nesting is fine, but what would 'e' and 'b' be, for example? | 17:30 |
| kiorky | i dont want to have to checkout from the root to get just a leaf, i prefer a bunch of repo | 17:30 |
| bob2 | that is not how bzr works | 17:31 |
| bob2 | (depending on what you mean) | 17:31 |
| kiorky | bob2: in hg.minitage.org, the "minitage" will be "b" , and "minitage.paste" will be e | 17:31 |
| bob2 | in bzr, 'b' and 'e' would be unrelated | 17:33 |
| kiorky | agreed | 17:33 |
| bob2 | repositories just contain a bunch of branches that share storage | 17:33 |
| kiorky | yep, but i just need to have a mean to serve them throught http, in a tree view that reflects their organization on the filesystem | 17:34 |
| bob2 | right, but what would 'b' actually contain? | 17:34 |
| bob2 | a bare buildout or something? | 17:34 |
| kiorky | mostly just containers direcfories, but i can also turn them into real repositories to drop inside a 'README' for example | 17:35 |
| bob2 | do you mean "branch" when you say "repositories"? | 17:36 |
| kiorky | bob2: yep | 17:37 |
| kiorky | bob2: "GET /projects/cryptelium.net/a/b/c/ HTTP/1.1" 404, so it does not work :) | 18:06 |
| bob2 | dunno what that is | 18:07 |
| kiorky | bob2: i just created a repo in "/projects/cryptelium.net" and another one in "/projects/cryptelium.net/a/b/c/" and tried to see t in loggerhead. | 18:09 |
| bob2 | ok, never used that | 18:09 |
| nekohayo | uh, wtf | 18:23 |
| nekohayo | http://pastebin.ca/1091047 | 18:24 |
| nekohayo | why is it telling me strange stuff about locks? | 18:24 |
| bob2 | ? | 18:25 |
| bob2 | your commit failed | 18:26 |
| bob2 | perhaps bzr is still running | 18:26 |
| bob2 | if you are sure it is not, bzr break-lock file:///home/jeff/ | 18:27 |
| nekohayo | bob2: I did a killall bzr, so it shouldn't be running, didn't find it in htop either | 18:30 |
| nekohayo | seems to work, thanks! | 18:32 |
| kiorky | jelmer: bob2 what is the mechanism which allow me to branch over loggerhead there : http://bzr-playground.gnome.org/glib-java/trunk/ | 19:00 |
| kiorky | jelmer: bob2 i have a repo served by loggerhead, but i cant directly branch over it. | 19:00 |
| bob2 | does hg work over bare http? | 19:01 |
| kiorky | nope | 19:02 |
| kiorky | bob2: you need either "hg serve" or a cgi. | 19:03 |
| Peng_ | Yes, it does, kinda/mostly. | 19:12 |
| Peng_ | kiorky: I don't think Loggerhead is involved with that. I bet the web server is just set up to send /foo/bar/ to Loggerhead and serve /foo/bar/.bzr/ directly. | 19:14 |
| Peng_ | ...Which would be the same setup as Launchpad. | 19:17 |
| kiorky | Peng_: ha great to know | 19:42 |
| kiorky | Peng_: maybe do you know some post/docs to achieve that ? | 19:42 |
| kiorky | Peng_: i mean, they do that with LocationMath or such ? | 19:44 |
| kiorky | *LocationMatch | 19:44 |
| kiorky | Peng_: https://bugs.launchpad.net/loggerhead/+bug/248897 :p | 19:46 |
| ubottu | Launchpad bug 248897 in loggerhead "Teach loggerhead about trunk and user branches" [Low,Confirmed] | 19:46 |
| Peng_ | FWIW, there is discussion about hafing Loggerhead support serving branches directly. | 19:51 |
| beuno | jelmer, pong | 20:02 |
| beuno | james_w, thanks for all the patches :) | 20:16 |
| james_w | beuno: no problem | 20:16 |
| james_w | beuno: I think my friend and I are going to work a kind of tutorial for using bzr and bzr-upload and fitting it in to your workflow. Possibly to become a presentation at an upcoming conference. | 20:18 |
| beuno | james_w, oh, that's getting very interesting! What conference? | 20:19 |
| james_w | something in Toronto I think, she'll be presenting, not me. | 20:20 |
| james_w | we'll surely be asking for feedback on it | 20:20 |
| beuno | james_w, I'll surely be happy to provide it :) | 20:20 |
| james_w | :-) | 20:21 |
| * beuno wonders how loggerhead copes with stacked branches | 20:26 | |
| beuno | let's try... | 20:26 |
| === Verterok_ is now known as Verterok | ||
| beuno | james_w, could you help me test LH's setup? I think it's failing, but I'm not sure if it's because I've played around it so much or not: bzr branch lp:~beuno/loggerhead/fix_setup/ && python setup.py install | 21:03 |
| jelmer | beuno, Hi! | 21:28 |
| jelmer | beuno, Was just wondering if you could perhaps do some bzr-gtk reviewing | 21:28 |
| beuno | jelmer, sure. I was just answering your Release? email | 21:28 |
| jelmer | beuno: I'll have a look at that setup.py now as I promised earlier :-) | 21:29 |
| beuno | jelmer, heheh, incidently | 21:29 |
| beuno | it's failing for me now | 21:29 |
| beuno | see ^ | 21:29 |
| jelmer | beuno, works fine here | 21:32 |
| beuno | jelmer, can you run it in a branch? | 21:33 |
| jelmer | Just tried to install and then ran it | 21:33 |
| beuno | serve-branches | 21:33 |
| jelmer | Yeah, that's what I'm running | 21:33 |
| beuno | it tells me it can't import templates when I open it up via FF | 21:33 |
| beuno | it used to work, so I may of broken something installing/deleting | 21:34 |
| beuno | thanks | 21:34 |
| jelmer | yep, from the branch works as well | 21:34 |
| beuno | jelmer, super, thanks | 21:34 |
| jelmer | ah, now I get it as well | 21:34 |
| jelmer | sorry :-/ | 21:34 |
| jelmer | ImportError: No module named templates | 21:35 |
| beuno | ah, heh, ok | 21:35 |
| beuno | yeah | 21:35 |
| beuno | the dir is there | 21:35 |
| beuno | so I don't understand why it doesn't find it | 21:35 |
| beuno | there == installed | 21:35 |
| uws | missing __init__.py perhaps? | 21:36 |
| beuno | the dir doesn't have py's in it, just zpt templates. Would I still need the __init__? | 21:37 |
| uws | dunno | 21:37 |
| beuno | jelmer, merged your 2 patches. There are 2 left that you requested phanatic's review. Would you like me to review them anyway? | 21:46 |
| jelmer | beuno: If you feel you're familiar enough around olive's source code, please do | 21:47 |
| beuno | jelmer, I don't. I can test as far as to make sure nothing is broken :) | 21:48 |
| beuno | I'll leave it for Silvester | 21:48 |
| jelmer | ok | 22:04 |
| nDuff | How do I export any "--local"ly committed changesets? "bundle" seems to require that I have things on separate branches. | 22:24 |
| james_w | nDuff: does "bzr send" do what you want? | 22:28 |
| james_w | possibly "bzr send <parent-url>" | 22:28 |
| * awilkins sighs | 23:02 | |
| * awilkins is back from Ireland | 23:02 | |
| jelmer | 'evening awilkins | 23:04 |
| jelmer | awilkins: Where've you been? | 23:04 |
| * jelmer was there a couple of weeks ago as well | 23:05 | |
| awilkins | Connemara and Clare | 23:05 |
| jelmer | Ah, nice | 23:06 |
| Pilky | hey all, what would happen if someone was to do something like "bzr merge /somepath --weave --merge3". How would bzr handle that? | 23:11 |
| james_w | I think --weave and --merge3 are incompatible options | 23:12 |
| james_w | I think it may end up meaning --merge3 | 23:12 |
| Pilky | if I do a preview it runs fine | 23:12 |
| Pilky | ok | 23:12 |
| jelmer | awilkins: Some win32-related patches went into bzr-svn recently, so the test suite failures should've gone down again significantly | 23:15 |
| james_w | beuno: is http://libwilliam.wordpress.com/2008/08/01/anjuta-bazaar-plugin-v010/ from the ide integration work? | 23:27 |
| zbrown | Could someone tell me the bzr equivalent of "git reset --hard origin" | 23:28 |
| zbrown | ? | 23:28 |
| james_w | hi zbrown | 23:29 |
| zbrown | hi :) | 23:29 |
| james_w | that resets your branch and tree to be the same as the branch that you pull from? | 23:29 |
| zbrown | ya | 23:29 |
| zbrown | --hard being delete all changes | 23:29 |
| james_w | hmm | 23:29 |
| james_w | what version of bzr? | 23:30 |
| zbrown | 1.3.1 | 23:30 |
| james_w | ok, what I'd probably do is | 23:30 |
| zbrown | was trying to figure it out a while, but I couldn't find a solution | 23:30 |
| james_w | bzr pull --overwrite URL-of-parent | 23:30 |
| james_w | bzr revert | 23:30 |
| zbrown | ah ok | 23:31 |
| zbrown | I'll try that | 23:31 |
| james_w | there may be a better way | 23:31 |
| james_w | in 1.6 you won't have to look up the URL of the parent, which is an improvement | 23:31 |
| james_w | I don't think there's a one command way to do it though | 23:31 |
| dato | james_w: I'd do the revert first | 23:32 |
| james_w | hey dato | 23:32 |
| james_w | why's that? | 23:32 |
| dato | heya | 23:32 |
| dato | well, probably it won't matter much, but the pull could encounter conflicts? | 23:32 |
| zbrown | james_w: 1.3.1 didn't need the URL of the parent either | 23:32 |
| james_w | ah yeah, I guess that's probably better | 23:32 |
| zbrown | I just tried it that way | 23:32 |
| james_w | zbrown: ah, of course it won't | 23:32 |
| === _thumper_ is now known as thumper | ||
| lifeless | dato: hi | 23:58 |
| lifeless | dato: I hear you're preferring git these days? | 23:58 |
| dato | yep... | 23:58 |
| lifeless | any particular thing/feature? | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!