[00:18] Is there any way to rebase without actually referring to history? [00:18] Just spit out a pile of patch files, then re-apply them? === cinerama_ is now known as cinerama [00:19] I ask because I'm still wrestling with https://bugs.launchpad.net/bzr-svn/+bug/485601 and I need to rescue some branches in a repository with that disease [00:19] Ubuntu bug 485601 in Bazaar Subversion Plugin "missing chk node(s) for id_to_entry maps" [Critical,Fix released] [03:13] bueno thank you for the response, much appreciated [05:46] for bzr, do I always need to type the filename after? is it possible to auto add a whole bunch of files atuomatically (detected) if not already added? [05:51] 'bzr add' [05:51] just like that, will add everything in the tree that isn't ignored or already added [05:52] thanks, thats excellent! appreciate it [05:53] are there any known downsides to running off cygwin by the way? [05:53] it will be a bit slower than a native build, due to the cygwin path translation overheads [05:54] ah, ok if thats all it is it should be ok. My projects aren't huge (less than 50 mb) avg... [06:06] As far as I know we handle text/binary etc all correctly. [06:07] so no reason not to use it [06:11] thats true, but I am creating a bash script to automate a few things as I develop, and I want the script to be as portable as possible [06:12] i dont use windows much, just when I need something that only runs on windows will I use (like photoshop for example)... [06:13] bash script will only contain paths and stuff so that I don't need to type all that manually every time [06:13] or make mistakes using a gui [06:46] cool [08:10] morning [08:11] hi [09:27] hi, does anyone know how I can get bzr-upload plugin instlled on a cygwin setup? [09:28] eagleon1: like any other bzr plugin I suspect - 'bzr branch lp:bzr-upload ~/.bazaar/plugins/upload' [09:30] thanks, will try that out :) appreicate it [09:32] hmm.. I get an SSL error msg when attempting that: Value "/etc/ssl/certs/ca-certificates.crt" is not valid for "ssl.ca_certs" [09:32] No valid trusted SSL CA certificates file set. See 'bzr help ssl.ca_certs' for more information on setting trusted CAs. [09:32] See `bzr help ssl.ca_certs` for how to specify trusted CAcertificates. [09:32] Pass -Ossl.cert_reqs=none to disable certificate verification entirely. [09:32] bzr: ERROR: _ssl.c:323: No root certificates specified for verification of other-side certificates. [09:35] ok, read the help file.. added 'ssl.cert_reqs=none' to my config and it works now :) [09:36] that's a win for the error message clarity. [09:36] yep, indeed :) [09:37] there was more info on adding an SSL cert, but I don't really need that [09:37] hmm.. this installs the plugin on my user account, is there a similar way to put it system wide? [09:38] hm, I don't recall exactly with cygwin [09:38] but basically putting in the plugins dir of where bzrlib is installed will do [09:38] ah ok, that helps [09:38] if there's a setup.py script, running that should do. [09:39] ...I can't even remember if you need to elevate to root for cygwin when doing that [09:39] any idea where this is installed on cygwin by default? [09:39] root does not exist on cygwin by default [09:40] `python -c "import bzrlib;print bzrlib"` [09:40] ah, excellent.. thank you :) [09:41] [09:41] cd /usr/lib/python2.6/site-packages/bzrlib/ [09:41] oops [09:41] sorry [09:42] cd plugins [09:42] actually this path does not exist... hmm [09:42] probably a symlink at the python2.6 level? [09:42] possible.. but shouldnt that still cd [09:43] cygwin is a bit funky with directories [09:43] yeah, its funny.. i went to: /usr/lib/python2.6/site-packages/ [09:43] and that worked and I can se bzrlib right there [09:43] try branching bzr-upload then running `python setup.py` inside that branch? [09:43] now cd bzrlib/plugins worked :) [09:44] ...silliness [09:44] * mgz bops cygwin [09:44] indeed.... :P [09:44] will try your suggestion [09:45] actually, just one question crosses my mind... when I read the manual/ref regarding bzr push, it mentioned that the working tree is uploaded for supported formats... but it didn't mention what protocol that was... I use bzr+ssh:// shouldn't that push the tree? [09:46] if it does I wont need bzr-upload right? [09:46] think of push as not creating a tree on the destination, as that's true for all the cases you're likely to care about [09:47] hmm.. in my case I want to update a live web demo of the app that I am working on... so push wont be sufficient then right? [09:47] it will update a tree only if it has a local filesystem, not over http/sftp/bzr+ssh [09:47] bit confused, what do you mean by local file system? [09:48] something that can be addressed with a file: url [09:48] ah ok, so file:// [09:48] so, it could be network filsystem mounted locally [09:48] oh I see [09:48] this makes sense :) [09:48] thanks [09:48] but for deploying your branch on a server, bzr-upload is probably what you want [09:49] yes, looks like it. :) [09:52] as per your suggestion, ive 'bzr branch lp:bzr-upload' ... and now inside bzr-upload, attempting to run the setup.py [09:52] i get error: no commands supplied [09:53] does this have something to fo with cmds.py I wonder (?) [09:53] *do with [09:54] install is what you want to do, so `python setup.py install` [09:54] ah got it, thanks [09:54] bad example by me before [09:55] no problem, it worked wonderfully (it seems) [09:57] looks like i need t rename that from bzr-upload to upload [09:58] that got it working... [09:59] now to document all of this for next time. Thanks for all the help, it's much appreciated :) [11:00] in bzr upload, is there a way to define a .bzignore just for this plugin? for example, there is a folder that I want to version control so it can't be ignored, but I dont' want this folder uploaded every time I run bzr upload... I couldn't find a solution in the docs [11:41] not sure if I got a response to this question, my client crashed: in bzr upload, is there a way to define a .bzignore just for this plugin? for example, there is a folder that I want to version control so it can't be ignored, but I dont' want this folder uploaded every time I run bzr upload... I couldn't find a solution in the docs [11:43] not that I know of. [11:45] :( [11:46] I will probably have to maintain that other dir separately, but I guess if it was nested this would be basically impossible [11:47] ...unless... I modify the .bzignore just before the bzr upload... would that work? [11:47] and then put it back right after.. [11:49] I don't think upload knows or cares much about .bzrignore... [11:50] it does, says so in the docs [11:50] havent tested yet tho [11:50] I take it back, there's a .bzrignore-upload in the code at least [11:50] try that. [11:50] ah, thats interesting [11:51] thanks, ill give it a shot [11:51] needs to be versioned [11:53] yeah, this is great... [11:54] this solves my problem [11:54] * eagleon1 slaps himself for not reading the documentation properly [16:09] Hey guys just throwing out a thanks for the people behind bzr explorer it's meant that I could see what bzr was doing. It also meant I was able to ask some sensible questions about how the other devs on my team did local branches (I surprisingly had it all wrong) [16:10] So thanks for making things so easy to see [18:58] hi, I have an issue starting today. whenever I try to push a branch I get a Permission denied error from LP, saying 'You cannot create branches in "~username/project" [18:58] any ideas? [20:29] anyone around? :) [20:30] Of course. [20:30] cool, I was hoping I could get a bit of help on a small error msg im dealing with .. [20:31] Never ask to ask, just ask. If I can't handle it, someone else will eventually . :-) [20:32] sounds good :) one sec, will paste the error here... [20:32] bzr: ERROR: Invalid url supplied to transport: "bzr+ssh://eagleon@domain.com:22/~eagleon/domains/public_html/test1": URLs must be properly escaped [20:33] i changed only the domain name, that's exactly how I have everything else tho [20:33] what have I got wrong? [20:33] was trying diff variations for a while with no avail [20:35] thats on a bzr push command btw [20:36] Where's it getting the URL from? [20:36] the command is invoked from a python script, which is getting it from a csv file [20:36] bzr push bzr+ssh://eagleon@domain.com:22/~eagleon/domains/public_html/test1 [20:37] thats the command [20:37] it also worked fine with a bzr upload just earlier [20:37] very confusing [20:38] (but that was without the python invocation) [20:38] Check .bzr.log to be sure the command is coming in right, and see if it says anything more illuminating about where the error happens. [20:38] good idea, checking now [20:39] where is the log? this is on cygwin... :-S [20:42] `bzr version` says I think. [20:42] indeed it does, found and checking now [20:46] in the log, it looks like this: InvalidURL: Invalid url supplied to transport: "^Öbz+ssh:// [20:46] this could be the problem, and cygwin the culprit [20:51] Does sound a little unhelp ;p [20:52] yeah... are those strange chars at the end normal? [20:52] ^Öbz [20:52] I wouldn't think so. I've never seen such a thing. [20:53] yeah... i think its caused by the new cygwin terminal [20:54] I wasn't able to cd to a dir that I knew for sure that existed (when I put the full path)... [20:54] i could cd to it dir by dir... [20:54] this may be a related problem