| jelmer | kolbe: what bob2 said | 00:36 |
|---|---|---|
| === thumper-lunch is now known as thumper | ||
| kolbe | How do I go about branching into a shared repository and resuming such a thing? | 01:56 |
| === wedgwood is now known as wedgwood_away | ||
| === r0bby is now known as robbyoconnor | ||
| === mmrazik is now known as mmrazik|afl | ||
| === mmrazik|afl is now known as mmrazik|afk | ||
| === jamesh_ is now known as jamesh | ||
| === mmrazik|afk is now known as mmrazik | ||
| bob2 | make repository | 09:22 |
| bob2 | cd to it | 09:22 |
| bob2 | branch | 09:22 |
| bob2 | success | 09:22 |
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| === wedgwood_away is now known as wedgwood | ||
| marcoceppi | Where is the bazaar.conf on Windows 7 installs? | 13:43 |
| LarstiQ | marcoceppi: `bzr --version` has a line with 'Bazaar configuriation:' | 13:53 |
| marcoceppi | LarstiQ I try overriding ssl.ca_certs in a bazaar.conf file in the "configuration directory" but it doesn't seem to take effect | 13:54 |
| marcoceppi | Nevermind, I've gotten past that problem, Now whenever I try to Branch on windows with bzrlib I get invalid url supplied to transport when using lp: addresses | 13:59 |
| LarstiQ | marcoceppi: is that with bzr straight, or using some of your own code? | 13:59 |
| marcoceppi | LarstiQ It's using bzrlib in a light python wrapper I wrote, that does a Branch.open('lp:charms/ubuntu') which produces this error: | 14:01 |
| LarstiQ | marcoceppi: you'll need to load plugins | 14:01 |
| LarstiQ | let me check | 14:01 |
| marcoceppi | LarstiQ I do already, this code currently works on Ubuntu | 14:01 |
| LarstiQ | marcoceppi: ah hmm | 14:02 |
| marcoceppi | http://paste.ubuntu.com/5637024/ | 14:02 |
| LarstiQ | marcoceppi: pastebin the error? | 14:02 |
| LarstiQ | cheers :) | 14:02 |
| LarstiQ | marcoceppi: ah, that looks like an ssh problem | 14:02 |
| marcoceppi | Nothing in the .bzr.log other than the "Launchpad login" thing | 14:02 |
| marcoceppi | Yes, which Windows handles so well :) So, any way to work around that on Windows? | 14:03 |
| LarstiQ | marcoceppi: it is possible to set up ssh on windows, I believe putty works | 14:04 |
| LarstiQ | marcoceppi: or if you don't mind, you can use http instead of bzr+ssh | 14:04 |
| marcoceppi | LarstiQ I wouldn't mind too terribly, to be honest, how would I force load_plugins to translate lp: urls to use HTTP instead? | 14:05 |
| marcoceppi | And does the bzr+http scheme allow for pushing? | 14:05 |
| LarstiQ | marcoceppi: it should use http already if you don't have launchpad-login set, afaik | 14:05 |
| LarstiQ | marcoceppi: no | 14:05 |
| LarstiQ | so I'm a bit confused by the error log | 14:05 |
| LarstiQ | marcoceppi: http://wiki.bazaar.canonical.com/Bzr_and_SSH has some instructions | 14:07 |
| marcoceppi | Well, I guess I need bzr+ssh to work then. I know PuTTY doesn't actually do anything but make software available, so I'm not sure how Bazaar would know to use it for SSH connections | 14:07 |
| LarstiQ | marcoceppi: bzr has some support for putty/pageant | 14:07 |
| marcoceppi | Ah, interesting | 14:08 |
| marcoceppi | I'll give that a shot, thanks LarstiQ | 14:08 |
| LarstiQ | marcoceppi: I hope it is enough | 14:08 |
| * LarstiQ back to math | 14:08 | |
| marcoceppi | Well, I'll be back soon enough if it's not ;) | 14:08 |
| === mmrazik is now known as mmrazik|otp | ||
| marcoceppi | LarstiQ still not working, I wonder if it's because of the %5C in the URL, it's having some weird issue with URL decoding | 14:21 |
| marcoceppi | OH, I know what I did wrong | 14:23 |
| marcoceppi | I'm using os.path.join to build the lp: url | 14:23 |
| === mmrazik|otp is now known as mmrazik | ||
| kolbe | bob2: "bzr branch lp:mysql-server/5.5 ." gives me "bzr: ERROR: Target directory "." already exists" | 15:08 |
| kolbe | well i managed to get that pretty easily by using --use-existing-dir but i have to say this workflow is pretty perplexing to me | 15:09 |
| kolbe | oh nope, that didn't work either | 15:10 |
| kolbe | "bzr: ERROR: Already a branch: "."." | 15:10 |
| mgz | kolbe: you want to branch it into a fresh directory | 15:14 |
| mgz | possibly without the tree, or possibly colocated, but you can't just branch over the top of an existing branch | 15:14 |
| kolbe | mgz: some time yesterday bob2 had told me "make repository; cd to it; branch; success" | 15:14 |
| kolbe | but that doesn't really seem to work out so well | 15:14 |
| kolbe | i guessed that "make repository" meant "bzr init" but perhaps that wasn't right | 15:15 |
| mgz | indeed not | 15:15 |
| mgz | you want `bzr init-repo` | 15:15 |
| kolbe | huh | 15:16 |
| mgz | try reading the introduction section of the user guide | 15:16 |
| kolbe | mgz: the main goal of all of this was to try to find a way for "bzr branch" to allow me to resume if my connection dies part way through | 15:17 |
| kolbe | i already have a shared repository and i was just doing "bzr branch lp:mysql-server/5.5 5.5" from the directory that holds the shared repository | 15:17 |
| mgz | http://doc.bazaar.canonical.com/beta/en/user-guide/ | 15:17 |
| kolbe | but if my connection dies and bzr branch stalls, i couldn't figure out any way to get it to resume | 15:17 |
| mgz | right, the general work around for that is do a manually pull in a sequence of revision ranges | 15:18 |
| kolbe | that guide doesn't seem to address resuming a branch operation, i looked there at some point | 15:18 |
| kolbe | oh my | 15:19 |
| mgz | so, `bzr branch -r..100 FROM` then cd into the branch and `bzr pull -r100..200` and so on, can shell script that reasonably easily | 15:20 |
| mgz | you probably want to make sure you're using bzr+ssh, so give bzr your launchpad login and upload your ssh key to your user account if you've not done it already | 15:21 |
| kolbe | does bzr+ssh have some particular benefit when just branching some public project? | 15:25 |
| mgz | faster for subsequent operations, so, useful in this case | 15:26 |
| kolbe | ok, thanks | 15:26 |
| * kolbe wonders what bzr+ssh is doing that makes it faster than whatever happens when not using it | 15:27 | |
| mgz | it does operations server-side | 15:28 |
| mgz | so, pulling in changes when you already have some is handled by your client saying what it has then the server packing up the missing bits and sending them | 15:28 |
| mgz | rather than the client looking at the data files directly and trying to pull out the bits it needs | 15:29 |
| kolbe | an initial branch seems to take an extremely long time, no matter how fast my connection is | 15:30 |
| kolbe | is bzr manually grabbing each revision since the dawn of time? | 15:30 |
| mgz | no, but it is the whole project history | 15:31 |
| mgz | it's packed up in a sane manner, but for big old projects it's still a lot of data | 15:31 |
| kolbe | yeah | 15:31 |
| === mmrazik is now known as mmrazik|afk | ||
| === deryck is now known as deryck[lunch] | ||
| === yofel_ is now known as yofel | ||
| SamB | kolbe: bzr-svn is the one that has to grab revisions one-by-one | 17:30 |
| kolbe | blah, this is horrible | 17:49 |
| === deryck[lunch] is now known as deryck | ||
| === wedgwood is now known as wedgwood_away | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!