=== mthaddon_ is now known as mthaddon [00:24] I got annoyed with the lack of up-to-date RHEL/CentOS RPMs and built some. Anything I should do with them? [00:27] mwhudson: yes. I'm looking to do that [00:27] igc: cool :) [00:36] I installed bazaar but it seems that bzr dosent work behind proxy with authentication...Is there any way to make bzr work? === Kittens is now known as phrik === phrik is now known as Kittens [00:53] does including the password in http_proxy work? [00:58] how do i cancel a merge? (bzr status stil shows all pending merges0 [01:00] jbalint: bzr revert [01:00] bzr revert --forget-merges if you want to keep the text changes [01:01] ah, reverted already , needed that forget-merges. thanks [01:02] revert . will revert the text changes but not the merges [01:02] ok [01:03] 'revert' on its own does both [01:03] oh i see [01:10] hello, I just branched bzr.dev and tried to upgrade it to --1.9-rich-root but the upgrade just hangs with 99% CPU [01:11] that might be a bug, but why a rich root format? [01:12] bob2: for no specific reason, just playing around [01:14] I have found https://bugs.launchpad.net/bugs/177874 but in that case there is an explicit error (and the bug its quite old) [01:14] Launchpad bug 177874 in bzr "upgrading to rich-root-pack fails" [Critical,Fix released] [01:14] ubottu: you read my mind :) [01:14] Error: I am only a bot, please don't think I'm intelligent :) [01:22] First stab at updated RHEL/CentOS packages: http://fourkitchens.com/blog/2009/01/21/bazaar-111-bzrtools-1110-rpms-red-hat-enterprise-linux-5-centos-5 [01:22] They seem to work. [01:37] is file_id format depends on the repo/branch format? [01:45] jbalint: I think so [01:45] would it ever change by branching? [02:07] * igc lunch [02:07] bob2: i tried http proxy but its saying that bzr: ERROR: socket.error: (111, 'Connection refused') [02:07] bob2: also http://www.mibbit.com/pb/Z1UtTw [02:08] so i filed a bug report [02:26] would anyone object to my putting back the set_plugin_path on import of bzrlib? [02:27] its really annoying not having it [02:27] hi lifeless [02:27] hi beuno [02:27] what would be the consecuences of doing that? [02:27] I know it breaks stuff not having it [02:29] I don't see any consequnces [02:29] bzr --no-plugins shouldn't be loading stuff anyhow, and there is an omplicit plugin path anyhow [02:30] hard to object to that :) [02:32] anybody have a tip on where to find svn2bzr? this page is leading nowhere http://bazaar-vcs.org/svn2bzr [02:33] Please help me in getting this removed: http://www.mibbit.com/pb/Z1UtTw [02:50] mib_65qsfnbw: I'm not quite sure what you're asking [02:50] I installed bazaar but it seems that bzr dosent work behind proxy with authentication...Is there any way to make bzr work? [02:52] the lp: syntax doesn't work, but all our other http stuff should work fine [02:52] as far as I know that is [02:53] lifeless: i am newbie to this bzr thing can you be please more elaborative ( what is http stuff)? [02:53] I'm sorry, I have a very bad connection here; I'll let someone else elaborate [02:53] igc: perhaps you are around and could help mib_65qsfnbw ? [02:53] lifeless: fine thankyou [03:04] mib_65qsfnbw: I believe that what lifeless is saying is that while you can't check out the code using bzr clone lp:geany [03:04] mib_65qsfnbw: you might be able to check it out using [03:05] mib_65qsfnbw: bzr clone https://code.launchpad.net/~vcs-imports/geany/trunk geany [03:06] mib_65qsfnbw: my own checkout hasn't finished, so I can't be sure :) [03:12] jearl: "bzr branch http://bazaar.launchpad.net/~vcs-imports/geany/trunk" this one wotked for me [03:13] I got it by googling [03:14] jearl: Ho would I know which packages can be got using the above command( bzr branch http://bazaar.launchpad.net/~vcs-imports/genay(or any othe app)/trunk ) [03:15] lifeless, mib_65qsfnbw: can't help right now sorry (heading to the hospital for the rest of the day) [03:15] see everyone tomorrow [03:19] if the cbranch command does a branch then checkout, is there a sbranch (or something) that does branch and switch? [03:20] mib_65qsfnbw: Well, all of them. lp:whatever is just a shortcut that looks up the actual URL. It's just figuring out what the URL is... [03:22] You can probably figure it out by looking at the project on LP with a browser. [03:23] fullermd: OK [03:23] gotta go I have a lecture to attend see you in 2 hours... [04:10] how do i get svn-import to create separate bzr branches for my svn branches? I just get on bzr branch with each svn branch and trunk in the bzr branch [04:12] jbalint: have you checked the faq? [04:12] this one? http://samba.org/~jelmer/bzr-svn/FAQ.html [04:12] i try separately --scheme and bzr svn-branching-scheme --set [04:13] but it seems each time i run svn-import it reverts it to none in ~/.bazaar/subversion.conf [04:17] * AfC wonders why bzr is so slow on his (borrowed) Ubuntu system. [04:18] I tried --no-plugins to see if that made a difference, but only about 0.08s [04:18] (just taking times from .bzr.log) [04:19] whereas bzr status on a 2 revision 5 file tree is taking 1.2s [04:19] Maybe I just didn't notice, but it sure feels slower than my other system. All things are not equal, of course, but... [04:19] bzr 1.11 from PPA [04:21] Does it have the C stuff compiled? Maybe that's missing... [04:21] AfC: is it a bound branch ? [04:22] 1.2s smells like a network round trip on this network [04:23] The operation mysteriously permeated the air with the lingering stench of latency. [04:23] :-) [04:27] fullermd: I wondered about that, but `dpkg -L` showed a bunch of .so files, so... [04:28] lifeless: no. Just a straight up been-working-on-this-brand-new-branch-for-only-an-hour-or-two. [04:28] lifeless: (on the assumption that it doesn't change, I'll show you later in case you care to poke it) [04:29] lifeless: (you have better things to do) [04:30] What's the process for getting packages listed on the downloads page? I know I can technically edit it, but I'm curious if there's some procedure for vetting the sources. [04:42] hey guys, I'm trying to pull in an external (svn) library into my project, and I'm wondering if branching it with bzr-svn, upgrading my repo format to 1.9-rich-root and bzr joining it in is the sane approach, or if there's a better way [05:00] AfC: please do show me [05:01] lifeless: will do. I'm up the hill right now, but next time I cross paths with you I'll mention it. [05:02] Ycros: that's an interesting question; I imagine there's no right answer, so you're probably best off to try a few different ways and see what you end up with. [05:02] Ycros: (and then you'll be the expert! Ta-da, sucker) [05:03] I'm trying things out now [05:03] I think bzr join --reference might be what I'm looking gor [05:04] Apparently, it's nested-tree-week on #bzr... [05:09] maybe... hmm. What I really want is something like svn:externals. I'm not just what join --reference just did, it looks like the external tree now appears as a bunch of unknown changes === Kittens is now known as Spaz === Spaz is now known as Kittens [07:03] hi all === stefan__ is now known as stefanlsd [07:20] vila: hi === davidstrauss is now known as crisis === crisis is now known as catastrophe === catastrophe is now known as snafu === snafu is now known as davidstrauss [09:03] Hi, can a revision's comment be changed? Like rcs -mrev:msg ? In a corporate setting, for political reasons, this can be required. Or, as just now, I've put in a very misleading comment. [09:04] The manual makes no mention of it that I can find, and I fear it's not possible; the message being part of a revision's unique key in some way? [09:11] it isn't [09:11] if it's the last revision, you can uncommit and recommit it [09:12] otherwise you can do some trickery, but you will end up with technically a different branch (at least since the changed revision) [09:12] Will that muck others up? I've done a `bzr push' with the wrong comments in? At the moment, I'm planning to do several uncommits in turn, saving the diffs as a patch, and then work forward again. [09:14] if anybody has a mirror of the branch, they will end up with diverged branches [09:14] the uncommitted revisions will *look* the same, but they will be different for bzr [09:14] Thanks luks. Does that stop simple `bzr merge' from working? There's just the two of us. I push and he sends back to me occasionally. [09:15] it doesn't, but then you will have two copies of each revision in the branch [09:15] k, think it's worth doing to clarify comments. [09:15] Including the one with the wrong message. Kinda defeats the purpose, especially in a nuclear scenario. [09:15] if you are just two, you can maybe tell him to pull --overwrite [09:16] oh, right, forgot about that :) [09:16] Thanks, will look into the --overwrite option. Basically, if he's no local changes then he can just --overwrite. [09:16] If you can talk other people into --overwrite'ing, it doesn't have THAT wide an impact. Where it really gets ugly is when they've already started work on top of the old stuff. [09:16] yep [09:18] btw, bzr replay from bzr-rebase can save you some time doing the uncomitting [09:18] Thanks. [09:36] try again guilhembi.. I want to ping you :) [09:37] vila: hello! Yesterday evening my internet connection went down, and this morning it just went up a few seconds ago. [09:37] After a second reboot of the livebox [09:37] here you are ! [09:37] change ISP :) [09:37] vila: bah === asac_ is now known as asac [11:39] hello james_w, is it possible to use bzr bd inside of a python script? [11:40] hey glatzor [11:40] you could import it and run the various parts [11:40] unfortunately there is quite a lot of logic in the Command class [11:40] or you could just run it under subprocess === bac_afk is now known as bac [14:13] are there any bzr plug-ins for netbeans? [14:13] yes, I believe so [14:14] interesting. Any pointers? Using Google didn't reveal anything terribly useful [14:15] for what it's worth, I discovered that Emacs plus tramp is bzr aware [14:16] hmm, don't see it on the wiki at BzrPlugins, not at launchpad.net/bazaar [14:16] and is not listed at net beans [14:16] * LarstiQ trwals the mailing list [14:16] I don't think it was in a usable state yet though [14:17] lampliter: people have certainly talked about it on the mailing list [14:17] * LarstiQ fails to find anything concrete right now [14:17] okay, I'll check there === kiko_ is now known as kiko === abadger19991 is now known as abadger1999 [15:11] jam, I know I said it already, but having --short as my default changed my life completely :) [15:11] beuno: I'm glad you like it as much as I do [15:11] I wish we could get away with making it the default [15:11] hi, i'm trying to create a branch of my files in trunk. am i supposed to copy the files using the filesystem, or is there some bazaar-command that eludes me here? [15:11] without encountering the "not similar to everyone else" problems [15:12] sjokkis: "bzr branch" ? [15:12] i tried that, but it tells me that trunk isn't a branch [15:13] "bzr: ERROR: Not a branch: "/blah/blah/project/trunk/"." [15:14] so what gives, jam? [15:14] sjokkis, what command are you running? sounds like you're adding extra stuff to the path [15:14] i ran "bzr branch . ../branches/port" from inside trunk [15:15] i can do this from inside my local checkout, right? [15:15] sjokkis, you probably shouldn't use . [15:15] so if you're inside trunk, bzr branch ../trunk ../branches/port [15:16] i get the same error doing that [15:18] i think this was originally imported from svn using the bzr2svn utility. if that matters [15:18] eh, svn2bzr [15:21] hey wondering fi anyone could give me any advice or thoughts on a workflow setup for web development [15:21] i have setup a repository on a dev box and given each of my developers vhost enabled checkouts of the trunk of my project [15:21] so everyone does updates and commits from their own checkouts [15:22] this just gives some simple separation [15:22] I have not looked into setting up branches yet [15:24] I now want to publish this trunk to a live box. I thought i could just do my live site as a checkout of this trunk [15:24] and then manually do a bzr update from the live box to get the latest revisions [15:24] i would then setup bzrignore to ignore the server specific settings files [15:25] wondering if this is a good approach or whether someone could suggest something more suitable [15:27] doh nobodies home :( [15:30] beuno, jam: neither of you guys can help me figure out how to do this? [15:31] sjokkis: sorry, I'm a bit distracted right now. [15:31] To start with, figure out where the actual branch is at [15:31] cd trunk; bzr info [15:31] It sort of sounds like things may not be what you think [15:31] ollie: That sounds like a reasonable workflow. [15:31] like maybe the branch is "trunk/foo" [15:31] or the branch is "project" and "trunk" is just a directory underneath [15:31] seems the branch is one level above trunk/ [15:32] so yeah, the branch is project/ [15:32] ollie: If you're not worried about having a working copy on your live site, you could just "bzr push" there instead of pulling from there. [15:32] that's fucked up... [15:32] OH, wait, by "live site" you mean you're checking out working code (PHP or something?) into a web site. [15:32] NfNitLoop: yeah [15:32] through the cms extra files e.g. images will be added [15:32] jam: what's the best way to sort this out? [15:33] so i think i will have to merge new changes in [15:33] sjokkis: it sounds like you may want to do another conversion, but using "bzr-svn" instead of svn2bzr [15:33] specifically, if you have the bzr-svn plugin installed [15:33] you then run "bzr svn-import" to do the conversion [15:33] ollie: well, if all you're ever doing is 'bzr pull' from your "trunk" branch, you shouldn't need to do any merging. [15:34] well i've already done quite a bit of work since i moved over to bzr, jam [15:34] jam: so if possible i'd like to keep my current repository. or export it. something [15:35] NfNitLoop: ok. One thing i was thinkning was giving my developers each a branch instead of them all doing checkouts of the trunk. However i havn't much experience with merging from one branch to another [15:35] there would certainly be ways to get your newer changes brought across [15:35] there are other things we could do [15:35] but I have the feeling you really don't want to have things in your current layout [15:36] and without re-converting, it will be problematic to merge between branches, etc [15:37] well i'll be happy to create a new layout etc [15:37] i just need to keep my history etc [15:37] etc [15:37] if I merge 2 unrelated branches by just creating the revision with the appropriate parents then I can continue to use both branches and merge between them, is that correct? [15:38] it's only the UI that prevents me from doing this by forcing me to do a cherry-pick merge, which leaves the branches with distinct revision histories? [15:38] sjokkis: so what I would recommend would be to try a new conversion, and see if that gets the layout you want [15:38] (don't delete your existing one yet) [15:38] and then we'll look at carrying across your more recent changes [15:41] jam: i don't have root on the machine my repo is on. can i do this on another machine and move the repo afterwards? [15:41] sjokkis: As far as I know you can [15:42] I'm not sure what access you need to the SVN repo, but I'm pretty sure just read access [15:42] as you can use bzr-svn with repos that you don't have write access to [15:43] jam: actually screw this. it's a smallish project, and i'm the only one working on it. we can just copy the files manually [15:43] and forget about the history [15:56] should the .bzr file show up as modified under bzr st. I would of thought that bzr wouldn't include this in its version control [15:57] It doesn't track the ".bzr" directory. [15:58] It will track files like ".bzrignore" or ".bzr-whatever-you-want". [15:58] hmm [15:59] You sure it's actually ".bzr", not some sort of case-manipulated variation, or some Unicode oddity? [16:00] well i made it using bzr ignore ./config [16:00] so i guess bzr would of created the file in the correct way [16:00] You mean the file ".bzrignore"? [16:00] just suprised me that this is included in the version historuy [16:00] ye [16:00] s [16:00] Oh. Yeah, it's versioned. [16:01] thats a problem as i need to ignore different things on different systems [16:02] so is that not possible [16:05] ollie: You don't *have* to version it if you don't want to. 'bzr rm --keep .bzrignore && bzr ci .bzrignore -m 'oops, stop tracking .bzrignore'" [16:05] s/'/"/ [16:05] is bzr ci the same as bzr commit? [16:05] Yeah. [16:05] It's an alias. [16:06] ok [16:09] ollie: Why would you want to ignore different things on different systems? [16:10] its complicated :( [16:13] Anything in the inventory already will continue to be tracked though [16:14] Regardless of your ignore settings. And whether you ignore them or not :-) === sdboyer_ is now known as sdboyer === abadger19991 is now known as abadger1999 [16:23] ollie: If you need to ignore things on different locations you can: [16:23] a) ignore the things in both places [16:24] (if you are ignoring foo in place X and bar in place Y, ignoring foo and bar doesn't hurt anything) [16:24] b) Use the global ignore file in ~/.bazaar/ignore [16:24] which you can customize based on the machine you are no [16:24] on [16:24] ok brilliant thanks a lot jam [16:24] c) If you ignore something and the "bzr add X" it will still be versioned, because versioning something supersedes ignoring it [16:54] I'm a little confused on send/merge and the docs aren't helping. Can I do a send & merge entirely offline (sneaker net) if a co-worker and I have branches with a shared common ancestory? [16:55] jrwren: yes [16:55] jrwren: and provided you include enough information in your merge directives [16:56] jrwren: bzr send -o filename [16:56] jrwren: and then bzr merge filename [16:56] i did bzr send -r REVNOWEBOTHHAVE.. -o filename [16:56] it fails on merge [16:56] What's the error message? [16:57] http://pastebin.ca/1314855 [16:57] that was supposed to be a readable version of revision number we both have... [16:58] Does he really have it? "bzr log -r revid:ben@ben-pc-20090121162140-gx1ag11qswfwp556" [16:59] ooh, traceback [16:59] that's not supposed to happen [16:59] jrwren: have you confirmed the issue in bzr 1.11? [16:59] i have not. I'll try it now. [17:00] nope, I don't have that rev in my branch. AFAIK, that is the rev to which I'm trying to get. [17:04] i skipped moving to 1.11 because it is rc1 a few days ago. I guess I should have done it then. === EdwinGrubbs is now known as EdwinGrubbs-lunc === EdwinGrubbs-lunc is now known as EdwinGrubb-lunch === bac is now known as bac_lunch [17:15] same error with 1.11rc1 http://pastebin.ca/1314868 [17:15] maybe I need to include more information in my merge directives, but I don't know what that might be. [17:19] jrwren: my guess is that you don't have a proper mirror of the branch you are trying to merge into [17:19] normally use a centralized workflow, we commit/update from the same branch in the same repo. [17:19] "send" needs 2 branches [17:20] (not by my choice) [17:20] so you need 1 branch which is exactly what you started from [17:20] and then another which is the new stuff [17:20] why does send need 2 branches? can I achieve similar behavior with 1 branch ? [17:20] ah... [17:20] so he can branch -r 323 (our shared last match) and use that as the shared branch ? [17:21] basically, abentley felt that people made too many mistakes when trying to use 1 branch, so opted to not allow it [17:21] jrwren: right [17:21] thank you. [17:21] jam: this is the 2nd time you were of HUGE help to me. [17:21] I'm not sure whether I hope it is the last or not :) [17:21] I hope you don't need the help, but I'm always happy to help [17:24] hi all... I'm trying to check out a branch that lives on one of my servers, doing a bzr branch http://url/nameofbranch/ but it gives me ERRROR: not a branch. It traced down that bzr wants to access the .bzr dir that loggerhead doesn't export and gives 404. So now I would like to know how to configure loggerhead and bzr properly so I can get my branches? Is there anything I'm missing? [17:25] beniwtv: are you trying to check out from loggerhead page? [17:25] davidstrauss: yes *ducks?* :) [17:26] beniwtv: loggerhead does not give bzr the data it needs to branch [17:26] beniwtv: it's just a human-usable browser [17:26] beniwtv: are you running it behind apache? [17:26] beniwtv: in that case you can configure apache to redirect .bzr to the right place [17:26] beniwtv, there is a open bugreport in loggerhead about supporting this [17:27] beniwtv: you may also want to look at "bzr serve" to allow public branching [17:27] LarstiQ: No, loggerhead only. Should I use it with apache? Any tutorials on this? [17:27] davidstrauss: OK, thanks, I'll have a look at that [17:27] beniwtv: I typically use Loggerhead for human browsing and bzr serve behind xinitd for public branching. [17:30] beniwtv: And I run Loggerhead behind an Apache proxy [17:30] davidstrauss: I see. However, I would need two ports, for loggerhead and bzr serve. So if I want to have only one port, is this possible? (I would like that for simplicity) [17:31] hello [17:31] how can i add the bzr ppa key so the repo is verified? [17:32] beniwtv: what I do, is run loggerhead on localhost:8080 [17:32] beniwtv: Yes, you would need two ports [17:32] beniwtv: To run bzr serve and Loggerhead [17:32] beniwtv: and then use apache with ProxyPass for public access [17:32] LarstiQ: Yes, but how do you combine that with allowing public branching? That's why I run a separate bzr serve? [17:33] LarstiQ, davidstrauss: OK, thanks... That will get me going I think :) [17:33] davidstrauss: well, our 'public' branching goes via sftp:// [17:33] LarstiQ: But then it's not a smart server [17:33] davidstrauss: correct [17:34] (or bzr+ssh) [17:34] I think it would be difficult to secure public branching over bzr+ssh [17:34] davidstrauss: I would like to provide the convenience of branching from loggerhead urls [17:34] LarstiQ: agreed [17:34] davidstrauss: secure? You mean, control access of who branches what? [17:35] * LarstiQ is in a different environment :) [17:35] LarstiQ: no, in terms of preventing anyone from changing the "public" account password, preventing port forwarding, etc. [17:35] davidstrauss: so, for that, I'd use apache rewriting for http://loggerhead/branch/.bzr/ [17:35] LarstiQ: that would work [17:36] davidstrauss: that rings even less of a bell. My situation is a bunch of developers in two rooms fully trusting everyone. [17:36] can i authenticate bzr packages? [17:37] LarstiQ: I'm doing things like hosting repositories for Drupal development [17:37] stavros2: Bazaar releases are signed with gpg, is that what you mean? [17:37] davidstrauss: aah. Right. [17:37] When I say "public" branching, I mean by Joe Internet. [17:37] LarstiQ: well, apt is telling me that they can't be authenticated and won't upgrade them [17:37] No authentication [17:38] davidstrauss: yeah, handing out shell accounts to Joe Internet is less of an idea :) [17:38] stavros2: ah, apt. What repository are you using, the ppa? [17:38] http:// is also not a smart server, right? [17:38] davidstrauss: it can be with some work [17:38] LarstiQ: I mean right now [17:39] davidstrauss: doc/en/user-guide/http_smart_server.txt [17:39] LarstiQ: yes [17:39] LarstiQ: for intrepid [17:39] I do have Loggerhead and bzr set up so you can check out http://vcs.fourkitchens.com/drupal/6 as bzr://vcs.fourkitchens.com/drupal/6 [17:39] It's not too much of a pain [17:46] how happy is bzr-svn with back-and-forth type stuff? [17:46] luke-jr, you mean pushing back into svn and then pulling from svn ? [17:46] luke-jr, it's quite happy about that (-: [17:48] actually, I mean using 'bzr diff;bzr commit' and then doing 'svn up; svn commit' ;) [17:48] I noticed 'bzr diff' in a Subversion WC actually worked [17:48] even after an extra 'svn commit' [17:48] but does it update the .svn info when I 'bzr commit'? [17:48] yes [17:49] nice [17:50] if I 'bzr branch' from a svn URI, make a bunch of commits locally, then 'bzr push', do my commits get to Svn repo as if they happened when I committed them locally? ;) [17:50] yes [17:50] and finally, will Bad Things (TM) happen if I tell bzr-svn not to use svn props for metadata? [17:51] luke-jr: You can't do that when working in a .svn checkout [17:52] yes, different scenario [17:52] luke-jr, if you do a push without svn props ("bzr dpush") then if you have a second copy of your bzr branch, it won't be able to pull from svn ("Branches have diverged") [17:52] I see :/ [17:52] luke-jr, you can also use bzr-svn 0.5 and svn 1.5 on the server side [17:53] ? [17:53] that can use svn revision properties, which don't show up in "svn diff" and commit notification emails [17:53] ah [17:53] even over HTTPS? [17:54] yes, the protocol is not relevant as long as it's Subversion 1.5 on the other side. === bac_lunch is now known as bac [18:02] whats the process for merging treeless repo branches into a trunk? i have say /web/project/trunk/blog/ and /web/project/branches/tim/blog and /web/project/branches/lucy/blog. The devs do checkouts of their respective branches into apache enabled directories so they can see their work at http://dev.lucy.project.com. [18:02] However I am not really clear on how I would merge the changes within the branches [18:02] and whether using branches like this is really the right approach [18:04] ollie: well, you need a checkout to do a merge [18:04] so you could do: [18:04] bzr co /web/project/trunk [18:04] cd trunk [18:04] bzr merge /web/project/branches/tim/blog [18:04] bzr commit -m "bring in Tim's changes" [18:04] etc [18:05] I'm not 100% sure if you are trying to automate something, or if I'm missing what you need [18:05] the key thing is it needs to be done from a checkout [18:06] bzr: ERROR: Invalid http response for https://svn.openmethodscorp.com/svn/VXMLB/vxmlb/branches/CCXML/.bzr/branch-format: Unable to handle http code 401: Authorization Required [18:06] igc: what are you doing awake? [18:06] :) [18:06] how do I tell bzr my auth info? :/ [18:06] jam: finding it a little tricky to create this layout when i am not 100% sure how everything in bzr works [18:07] luke-jr: you can use ~/.bazaaar/authentication.conf [18:07] ollie: well, I don't really know what you are trying to accomplish either. What content is going to be where, and why are you merging individual's blog content back into trunk anyway? [18:09] jam: well I'd like to be asleep but it just isn't happening [18:09] LarstiQ: use it how? [18:09] i am basicially building a dev box and live box. The idea is that each developer can work on a project then i can merge them into a live version and push/pull/update that onto the live box [18:12] luke-jr: Please prefix your URL with svn+ [18:13] luke-jr: http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#authentication-settings [18:15] luke-jr: specifically for svn, you could use svn against the repo, make sure it stores your credentials, and then bzr-svn will pick up on that [18:15] luke-jr: you can give it a hint with https://user@.. [18:16] luke-jr: (or do that via authentication.conf) [18:18] LarstiQ: I already am using svn against the repo, it didn't [18:18] "The svn+ syntax is deprecated, use https://svn.openmethodscorp.com/svn/VXMLB/vxmlb/branches/CCXML instead." [18:19] luke-jr: *blink* [18:19] luke-jr: I meant the subversion application itself, say, "svn ls https://svn.openmethodscorp.com/svn/VXMLB/vxmlb/branches/CCXML" [18:19] luke-jr: bzr-svn can use the ~/.subversion credentials store [18:20] LarstiQ: I already have been using subversion itself for months [18:20] on this same branch [18:21] luke-jr: ok, then providing your username should be all you need to do. [18:21] luke-jr: if not, something has broken down (what versions of bzr and bzr-svn are you using?) [18:22] bzr: ERROR: Permission denied: ".": OPTIONS of 'https://svn.openmethodscorp.com/svn/VXMLB/vxmlb/branches/CCXML': authorization failed (https://svn.openmethodscorp.com) [18:22] 0.10 + 0.5 [18:23] 1.10 I hope, not 0.10 :) [18:23] ollie: sorry, grabbed some food. Anyway... [18:23] luke-jr: how did you specify the username? [18:23] yes, 1.10 [18:23] * LarstiQ has a look at the bzr-svn buglist [18:23] I would say users should generally have a checkout of 'live' [18:23] LarstiQ: I put it in the URI, and removed it from the error for security [18:23] and then another place where they work on their content [18:23] when they want to publish they would do [18:23] luke-jr: ok, that should have done it. Something broke then. [18:24] cd live-checkout [18:24] bzr up [18:24] bzr merge ../my-work [18:24] bzr commit -m"Publish XXX" [18:39] AHA [18:39] wrong username :x === lamont` is now known as lamont === asabil_ is now known as asabil [18:47] .list [18:51] is it possible to do a copy with bzr-svn? === Kittens is now known as Spaz [18:58] jelmer: LarstiQ: http://pastebin.com/m1231cf6c === EdwinGrubb-lunch is now known as EdwinGrubbs [19:29] poolie2: ping [19:31] does 'bzr mv' work with bzr-svn right, or does it just add? [19:46] meh [19:46] bzr dpush at least doesn't send timestamps right ☹ === Spaz is now known as Cthulhu === Cthulhu is now known as Spaz [20:51]