j0hn5 | I'm having trouble using bazaar, I used the command bzr branch foo ... to get the source code... I made the changes... and hit bzr push foo... and it tells me that there are no revisions to push :\ can anyone help me? | 00:09 |
---|---|---|
lifeless | j0hn5: well, you haven't committed ;) | 00:10 |
j0hn5 | can I freely create files on the source I downloaded? just have to make commit? | 00:10 |
j0hn5 | and then push? | 00:10 |
lifeless | j0hn5: yes; you probably should read the tutorial | 00:12 |
j0hn5 | I have the tutorial here... but still don't get it | 00:18 |
j0hn5 | I just made the bzr commit | 00:18 |
j0hn5 | and it tells me that there are no changes to commit | 00:18 |
j0hn5 | yet, I created a new folder with a file in it | 00:18 |
Necoro | j0hn5: have you "bzr add"ed the file/folder? | 00:19 |
j0hn5 | do I have to do that to both the folder and file? or just the folder? (since the file is in it | 00:20 |
Necoro | j0hn5: bzr add is recursive by default | 00:20 |
lifeless | when you run 'bzr add' it will scan for new files and folders | 00:20 |
j0hn5 | ah finally... that was it... I was missing the add | 00:21 |
j0hn5 | thanks lifeless and Necoro | 00:21 |
=== frej_ is now known as frej | ||
markh | jelmer: ? | 02:57 |
jelmer | markh, hi | 02:57 |
markh | hi jelmer: just to be clear - we are talking about proposing a new function to bzrlib's win32utils? | 02:57 |
markh | or is there one in bzr-svn? | 02:58 |
jelmer | markh: yeah, the one in bzr | 02:58 |
jelmer | markh, I'm trying to keep bzr-svn as platform-independent as possible, relying on the portability layers in both bzr and svn | 02:59 |
markh | ok cool, thanks. Just a little confused whenyou said "you would apply it" | 02:59 |
jelmer | bzr-svn would probably have to call that new function though | 02:59 |
markh | s/you/i/ in those quotes :) | 02:59 |
markh | yes, that is what I meant in the first place | 02:59 |
jelmer | I'm happy to apply a patch that changes the current bzr-svn code to use that new win32utils function | 03:00 |
markh | but it means bzr-svn will not see it until 0.7 | 03:00 |
markh | 1.7 either ;) | 03:00 |
jelmer | :-) | 03:00 |
jelmer | yeah, I don't think it's a problem to delay this until the next release of bzr-svn | 03:00 |
markh | me either - just making sure. I'll see how I go and submit a MERGE to bzr I guess... | 03:02 |
markh | then you can deal with it once it looks like landing | 03:02 |
markh | "deal with it" == "modify bzr-svn to use it" | 03:03 |
jelmer | k | 03:04 |
markh | can bzr's laxy-import mechanism handle ImportErrors? | 03:30 |
lifeless | markh: it exposes ImportError if thats what you mean | 05:23 |
markh | lifeless: at what point is it raised? | 05:46 |
* markh probably could just experiment... | 05:47 | |
Peng_ | markh: From experimentation I did a while ago, when it actually loads the module (meaning, when you first access it.) | 05:49 |
markh | Peng_: that would make it hard to catch reliably I guess... | 05:50 |
Peng_ | Yeah. I guess you can't lazy_import things you plan to catch ImportErrors for. | 05:51 |
markh | that's the conclusion I came to too :) | 05:51 |
=== kiko-afk is now known as kiko-zzz | ||
olejorgenb | hm.. can I revert a revert ? | 09:02 |
olejorgenb | I missunderstood the documentation and thought that only the bzr add would be removed, not the actual files | 09:03 |
olejorgenb | hehe, ups, the files are there, sorry | 09:05 |
ToyKeeper | Hmm,, can never remember how different systems handle this... | 09:35 |
ToyKeeper | Any idea how to insert bzr metadata into a versioned file? | 09:35 |
ToyKeeper | Like... putting revno into a program's version variable. | 09:35 |
LarstiQ | ToyKeeper: bzr version-info | 09:37 |
ToyKeeper | Thanks. I just found... http://doc.bazaar-vcs.org/latest/en/user-guide/index.html#exporting-version-information | 09:38 |
ToyKeeper | (trying to help a svn user learn bzr, and that's a feature I hadn't needed before) | 09:40 |
ToyKeeper | It's really not the same thing, but I guess in some cases it works. | 09:41 |
LarstiQ | ToyKeeper: what is not the same thing? | 09:46 |
luks | because it doesn't update on update | 09:47 |
ToyKeeper | IIRC, svn substituted certain strings at checkout/update time, without actually recording changes to the file. | 09:47 |
LarstiQ | ah, that. | 09:48 |
ToyKeeper | It could be done with hooks, but I don't see any hooks which look like they'd run at the right time. | 09:49 |
ToyKeeper | Maybe post_change_branch_tip | 09:49 |
LarstiQ | ToyKeeper: http://bazaar-vcs.org/KeywordExpansion | 09:50 |
LarstiQ | I'm really not a fan of it, but there you go. | 09:50 |
ToyKeeper | Not a big deal for me, but that should satisfy some svn users. :) | 09:50 |
LarstiQ | ToyKeeper: but do ask them to test that KeywordExpansion plugin, it is basically intended for people who want that, so they need to be happy with it, not me :) | 09:52 |
ToyKeeper | Hmm, seems to require bzr.dev. That might be hard to sell. :) | 09:57 |
ToyKeeper | At least it's really, really easy to run bzr.dev. I don't bother with .deb versions of bzr+plugins any more. :) | 10:03 |
Peng_ | It'd probably work in the 1.6 RCs. | 10:12 |
Peng_ | Or not. I dunno. | 10:14 |
fullermd | Well, I think it was for bzr.dev before 1.6 was branched, so I'd guess it'll work with 1.6. | 10:15 |
LarstiQ | ToyKeeper: right, so this is not from a standpoint of what I'd suggest they do right now in production, but as an investment in ensuring the proposed solution satisfies their needs. | 10:16 |
LarstiQ | ToyKeeper: me, I'll stick with version-info anyway since I dislike the keyword approach, but hey :) | 10:17 |
* fullermd wuvs keywords. | 10:17 | |
=== thunderstruck is now known as gnomefreak | ||
em1 | hi, when i execute a python script, it complains 'ImportError: No module named bzrlib.builtins' | 12:12 |
em1 | im a newbie, please help | 12:12 |
ToyKeeper | em1: Some context might help. Which script are you running? | 12:17 |
=== asabil_ is now known as asabil | ||
RAOF | Man, that's some high quality error message: "bzr: ERROR: Generic bzr smart protocol error: <Fault 8002: 'error'>" | 12:20 |
ToyKeeper | RAOF: Nice. :) | 12:20 |
RAOF | I wonder if it's reproducible, with -Dhpss. | 12:21 |
RAOF | Hm. Apparently it actually worked, too. Except it left a stale lock. | 12:22 |
em1 | hi, ToyKeeper, | 12:27 |
em1 | i am running lp:/openerp bzr_set.py | 12:27 |
em1 | does it means that i need install a module for python i installed it the first time | 12:28 |
em1 | i install bazaar then install python, when i try to run bzr_st.py and engine complain 'no module...', i uninstall bazaar and restall bazaar, but dont help | 12:30 |
em1 | bazaar, hello | 12:32 |
em1 | when i run you, i have trouble | 12:32 |
bazaar | hi. should i run "bzr serve" in inetd or via init script? are there any resources on bzr serve init scripts? | 12:32 |
bazaar | believe me -- a lot of people say that if they run me they have trouble ;) | 12:33 |
bazaar | no serious .. we all here at freenode#bzr love bazaar - do we? | 12:33 |
em1 | yes, i love you, but you often puzzled me | 12:34 |
ToyKeeper | em1: What OS/distro are you running? | 12:35 |
bazaar | ``should i run "bzr serve" in inetd or via init script? are there any resources on bzr serve init scripts?'' -- any ideas? | 12:35 |
ToyKeeper | It sounds like bzr isn't installed correctly. | 12:35 |
em1 | ToyKeeper, i am on windows xp | 12:35 |
em1 | http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/2007-May/000031.html | 12:35 |
em1 | above link is similar to my case | 12:36 |
em1 | but no windowxp solution there | 12:36 |
ToyKeeper | I have no idea how to correctly set up python or bzr on XP, but it sounds like bzr isn't completely installed. | 12:37 |
em1 | how about reinstalling bzr | 12:37 |
em1 | i use bzr1.6rc3 | 12:37 |
ToyKeeper | Apparently bzr isn't in your python path. | 12:38 |
em1 | maybe i should use bzr1.6rc5? | 12:38 |
ToyKeeper | It should work if you run: python -c "import bzrlib" | 12:38 |
em1 | running it have the same error | 12:39 |
ToyKeeper | As a kludge, you could probably add a "sys.path.insert(0, 'c:/path/to/bzr')" in a script to work around the issue, but it'll be better to get bzr installed correctly. | 12:40 |
em1 | i have cygwin installed, is that cause? | 12:41 |
ToyKeeper | Using bzr 1.5 might help. Or not, but it's worth a try. | 12:42 |
em1 | ok, i will try it | 12:42 |
ToyKeeper | And if you haven't read this, it could help: http://bazaar-vcs.org/WindowsDownloads | 12:44 |
em1 | C:\Program Files\Bazaar; | 12:44 |
em1 | if is the blank in path result in | 12:44 |
em1 | i will intall bzr to other place next time | 12:45 |
=== mwhudson_ is now known as mwhudson | ||
em1 | which is easier between stand-alone and python-based installer on window? | 13:11 |
em1 | got to go, bye all | 13:15 |
hsn_ | God, bzr reconcile is s.l.o.w. it runs 4 hours now at 0.5GB repo and still not done | 15:59 |
jelmer | hsn_, yeah :-( | 16:00 |
hsn_ | its knit, not pack repo but still | 16:01 |
beuno | it runs billion of times faster on packs :) | 16:02 |
hsn_ | how can i upgrade shared repo from knit to pack? bzr upgrade doesnt seems to do anything | 16:05 |
hsn_ | bzr: ERROR: The branch format Bazaar-NG meta directory, format 1 is already at t | 16:06 |
beuno | hsn_, you upgrade the the repo | 16:09 |
beuno | and the branches | 16:09 |
beuno | so, /code/shared_repo <-- bzr upgrade | 16:09 |
beuno | and, /code/shared_repo/branch <-- bzr upgrade | 16:09 |
=== mark1 is now known as markh | ||
jelmer | Odd_Bloke, hi | 16:39 |
php6th | hi | 17:58 |
jelmer | hi | 18:00 |
* beuno -> airport | 18:36 | |
eikke | has bzr got in-repository branches like, git-style, nowadays? | 21:12 |
pygi | well, you can initialize branches inside a repository :) | 21:17 |
pygi | but it's not really ala-git style | 21:17 |
eikke | i dont really care about the internals :) | 21:18 |
eikke | I'd need something pretty much like git branching, but this is a pure python project so a native environment mihgt be cool | 21:19 |
jelmer | eikke: the code is there in bzr-loom I think, there's just not much UI for it yet | 21:19 |
eikke | ok, I'll check that out | 21:19 |
eikke | still in research phase luckily | 21:19 |
jelmer | eikke, you may want to ask on the list - the people with the most knowledge about that don't appear to be around atm | 21:20 |
eikke | all right | 21:20 |
asabil | eikke: you may also want to check this: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#reusing-a-checkout | 21:21 |
asabil | actually it all depends on what you need "internal" branches for | 21:21 |
epsy | hi, i'm trying to install the bzr-svn plugin, i've put it in ~/.bazaar/plugins/svn/ and ran make, thus it doesnt show up in bzr plugins, but instead shows this warning: | 23:59 |
epsy | Unable to load plugin 'svn' from '/home/epsy/.bazaar/plugins' | 23:59 |
jelmer | epsy: any information in ~/.bzr.log ? | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!