| mwhudson_ | Peng_: bzr annotate http://bzr.mattnordhoff.com/bzr/loggerhead/cheezum/serve-branches explodes in an entertaining way :( | 00:10 |
|---|---|---|
| Peng_ | mwhudson_: Huh! | 00:10 |
| mwhudson_ | also nosmart+ | 00:11 |
| mwhudson_ | $ bzr annotate nosmart+http://bzr.mattnordhoff.com/bzr/loggerhead/cheezum/serve-branches | 00:11 |
| mwhudson_ | bzr: ERROR: Transport operation not possible: http does not support mkdir() | 00:11 |
| mwhudson_ | whut? | 00:11 |
| jelmer | mwhudson_, it's trying to get a lock | 00:11 |
| Peng_ | Oh, one of you has IPv6! Awesome! :D | 00:11 |
| mwhudson_ | oh | 00:11 |
| jelmer | Peng_, that must be me | 00:11 |
| mwhudson_ | it's certainly very unlikely to be me | 00:12 |
| mwhudson_ | jelmer: why would it do that? | 00:12 |
| Peng_ | jelmer: If there was a prize for "First IPv6 HTTP request that isn't localhost", you'd win it. :D | 00:12 |
| jelmer | mwhudson_, not idea | 00:12 |
| Peng_ | Unfortunately there's not. | 00:12 |
| jelmer | *no idea | 00:12 |
| mwhudson_ | bzr annotate http://bazaar.launchpad.net/~mnordhoff/loggerhead/cheezum/serve-branches also fails | 00:12 |
| mwhudson_ | in a rather different way though | 00:12 |
| Peng_ | I can annotate the file in my local branch. | 00:12 |
| mwhudson_ | oh | 00:13 |
| * mwhudson_ stabs historycache | 00:13 | |
| * jelmer is waiting for bzr to support gopher | 00:13 | |
| Peng_ | I can do it over HTTP too. | 00:13 |
| Peng_ | That file has ugly history, FWIW. | 00:13 |
| mwhudson_ | so at some point launchpad's mirroring produced a broken branch | 00:14 |
| mwhudson_ | though actually, given that it's bzr+http, that's not so amazingly surprising | 00:14 |
| Peng_ | :> | 00:14 |
| jelmer | thumper, moin | 00:22 |
| thumper | jelmer: hi | 00:22 |
| jelmer | thumper, you pasted a URL here earlier, what repository was that for? | 00:23 |
| thumper | jelmer: I'm trying to remember... | 00:23 |
| thumper | jelmer: I think it was another bzr-git failure | 00:23 |
| thumper | a different one | 00:23 |
| jelmer | thumper: Yeah, it was | 00:24 |
| jelmer | thumper, it didn't include a URL though, so it was a bit hard to reproduce | 00:24 |
| thumper | heh, oops | 00:24 |
| * thumper thinks | 00:24 | |
| jelmer | thumper, mwhudson_: btw, what's the eta on a new bzr-git on lp? there's a couple of issues now that should be fixed | 00:25 |
| mwhudson_ | jelmer: no specific eta, i guess it's not too much work though | 00:25 |
| thumper | mwhudson_: we could land it and roll it out | 00:25 |
| thumper | mwhudson_: it is very contained | 00:25 |
| mwhudson_ | right | 00:25 |
| mwhudson_ | even i have privs to roll it out :) | 00:25 |
| thumper | jfdi :) | 00:25 |
| thumper | really? | 00:25 |
| thumper | how? | 00:26 |
| mwhudson_ | yeah | 00:26 |
| mwhudson_ | this is a bad thing though | 00:26 |
| mwhudson_ | thumper: i can sudo importd on the relevant boxes | 00:26 |
| thumper | ok, I don't want to know then | 00:26 |
| igc | morning | 00:27 |
| jelmer | moin Ian | 00:28 |
| igc | hi jelmer | 00:32 |
| lifeless | jelmer: pong | 00:45 |
| lifeless | jml: yes | 00:45 |
| jml | lifeless: were there any interesting outcomes? | 00:46 |
| jelmer | lifeless, does subunit-stats work for you? | 00:51 |
| jelmer | lifeless, it only recognizes a single test for me in a large stream | 00:51 |
| lifeless | jelmer: checking | 00:55 |
| lifeless | jml: 'even code you don't think will be reused will be reused' is probably the strongest message I took away | 00:55 |
| lifeless | I have an unusual perspective though | 00:55 |
| jml | :D | 00:56 |
| lifeless | it was broadly: | 00:56 |
| lifeless | - bzr's structure is nice and landscape had a bunch of tools that would benefit being in that structure | 00:56 |
| lifeless | - it was too hard to reuse bzr's structure in situ | 00:56 |
| lifeless | - a 90% version [primarily bzr's ExternalCommand] was fast to TDD up | 00:57 |
| lifeless | - jkakar now wants the rest and is looking at actually reusing bzr's stuff :) | 00:57 |
| jml | lifeless: thanks, that's a helpful summary. | 00:57 |
| jml | lifeless: I guess bzr isn't going to start depending on commandant any time soon | 00:58 |
| lifeless | happily, for various reasons I'd been cleaning this up, and there is a patch I've done which allows nuking all the builtin bzr commands | 00:58 |
| lifeless | so you can have the infrastructure alone | 00:58 |
| jml | \o/ | 00:58 |
| lifeless | jml: the other way is quite likely | 00:58 |
| jfroy | jelmer: new bzr-svn assertion just started happening | 00:58 |
| jfroy | https://bugs.launchpad.net/bzr-svn/+bug/383414 | 00:58 |
| ubottu | Ubuntu bug 383414 in bzr-svn "Assertion in iter_changes on path" [Undecided,New] | 00:58 |
| jfroy | after I pushed a revision up | 00:59 |
| lifeless | jml: seen my facebook feed for a link to the patch; I promised jkakar I'd link it to him after the talk | 00:59 |
| lifeless | bzr.dev$ ./bzr selftest --no-plugins --subunit selftest | subunit-stats | 00:59 |
| lifeless | Total tests: 183 | 00:59 |
| lifeless | Passed tests: 182 | 00:59 |
| lifeless | Failed tests: 0 | 00:59 |
| lifeless | Skipped tests: 1 | 00:59 |
| lifeless | Tags: | 00:59 |
| lifeless | jelmer: ^ | 00:59 |
| jml | using facebook for *patches* | 00:59 |
| jfroy | I can no longer pull, push or branch that svn remote branch | 00:59 |
| jml | what the hell :) | 00:59 |
| lifeless | jml: for links to merge requests actually, but yeh. | 00:59 |
| lifeless | jml: hey, you guys bullied me into it. | 00:59 |
| jml | :D | 01:00 |
| jelmer | lifeless, also, does it really have to repeat all input to me? | 01:00 |
| jelmer | lifeless, or is that perhaps related? | 01:00 |
| lifeless | jelmer: you have a test that is managing to corrupt the output stream | 01:00 |
| lifeless | jelmer: I've been thinking of changing the control emitters to start their output with \n | 01:01 |
| lifeless | jelmer: which would insulate against this | 01:01 |
| jml | lifeless: anyway, it sounds like commandant and bzr are both proceeding in a direction that will make my script-writing life much better. :) | 01:01 |
| jelmer | lifeless: How can a test do that? | 01:01 |
| jfroy | Urg, and I just ran into https://bugs.launchpad.net/bzr-svn/+bug/383415 | 01:01 |
| ubottu | Ubuntu bug 383415 in bzr-svn "AttributeError: 'SubversionTags' object has no attribute '_resolve_reverse_tags_fallback'" [Undecided,New] | 01:01 |
| lifeless | jml: commandant's strengths are external commands and minimalism | 01:02 |
| lifeless | jml: Personally, I'd hammer on bzrlib until its perfect for your needs :) | 01:02 |
| lifeless | jelmer: say your stream is on stdout | 01:02 |
| jelmer | jfroy, that one should be fixed now | 01:02 |
| lifeless | jelmer: actually, just capture the first three tests or so | 01:03 |
| lifeless | and pastebin | 01:03 |
| jelmer | lifeless, http://pastebin.ubuntu.com/187766/ | 01:04 |
| jfroy | jelmer: ok | 01:06 |
| jfroy | But yeah, that logwalker bug has just killed me dead | 01:07 |
| jfroy | can't operate on the remote branches at all | 01:07 |
| jfroy | I can try reverting bzr-svn revision by revision to try to find the one that introduced the problem | 01:07 |
| jfroy | unless it's a new one... | 01:07 |
| jelmer | jfroy: I doubt this is a regression | 01:08 |
| jelmer | jfroy: I think it's a new problem, just looking at it now | 01:08 |
| jfroy | I think it started happening after I pushed some changes to svn | 01:08 |
| jfroy | and looking at the svn log | 01:08 |
| jfroy | it also pushed a merged branch up | 01:09 |
| jfroy | (I've since disabled that option, it seems to not be quite as well tested as it should be) | 01:09 |
| jfroy | and it was doing "strange" operations, like copying a directory unto itself on svn | 01:09 |
| lifeless | jelmer: cat /tmp/t | subunit-stats | 01:09 |
| lifeless | ... 1 fail | 01:09 |
| lifeless | jelmer: debugging tip - if you see that, run through subunit2pyunit | 01:10 |
| jfroy | e.g. copied foo/bar to foo/bar | 01:10 |
| lifeless | ====================================================================== | 01:10 |
| lifeless | ERROR: samba4.rpc.samba3.sharesec on ncalrpc with seal,padcheck (dc:local) | 01:10 |
| lifeless | ---------------------------------------------------------------------- | 01:10 |
| lifeless | RemoteException: lost connection during test 'samba4.rpc.samba3.sharesec on ncalrpc with seal,padcheck (dc:local)' | 01:10 |
| jelmer | jfroy, I think I see where the problem is | 01:11 |
| jelmer | lifeless, any idea what could cause that? | 01:11 |
| jelmer | lifeless, ah, perhaps explanations of the result arent' allowed for skip? | 01:12 |
| lifeless | should be | 01:13 |
| === Kissaki is now known as Kissaki^0ff | ||
| jelmer | lifeless, yeah, looks like it refuses those: | 01:14 |
| jelmer | test: foo | 01:14 |
| jelmer | skip: foo [ foo ] | 01:14 |
| jelmer | fails | 01:14 |
| jelmer | test: | 01:14 |
| jelmer | skip: foo | 01:14 |
| jelmer | works | 01:14 |
| lifeless | jelmer: well, subunit itself outputs explanations for skips | 01:15 |
| lifeless | so its something more than 'not supported' | 01:15 |
| lifeless | I don't think subunit knows how to deal with one-line explanations | 01:16 |
| jfroy | jelmer: http://home.devklog.net/~bahamut/12191.xml, http://home.devklog.net/~bahamut/12189.xml | 01:16 |
| jfroy | if that's of any help | 01:16 |
| jelmer | jfroy, revno 3033 should fix it | 01:17 |
| jelmer | jfroy, but thanks for providing such valuable bug reports | 01:17 |
| lifeless | jelmer: its dyin on the fail | 01:18 |
| lifeless | jelmer: the very first one, not the skip | 01:18 |
| jfroy | jelmer: no, thanks for being so awesome :) | 01:18 |
| jelmer | lifeless, Which fail ? :-) | 01:18 |
| lifeless | oh, I was testing something :) | 01:19 |
| lifeless | anyway | 01:19 |
| lifeless | you're quoting in a way that subunit doesn't expect | 01:19 |
| jfroy | jelmer: mmm, no joy | 01:19 |
| jelmer | lifeless, what does it expect? | 01:20 |
| lifeless | status:? NAME($| [) | 01:20 |
| jelmer | lifeless, fail [\nfoo\n]\n ? | 01:20 |
| lifeless | explanation* | 01:20 |
| lifeless | ]\n | 01:20 |
| lifeless | yes | 01:20 |
| jelmer | so I have to have a newline after the [ ? | 01:20 |
| jfroy | same backtrace | 01:20 |
| jfroy | though it seems I can pull existing branches now | 01:21 |
| lifeless | and then a final newline before the ] | 01:21 |
| jfroy | can't branch though | 01:21 |
| lifeless | but I'll accept a patch to handle your layout too | 01:21 |
| lifeless | simplest to get you going will be to use the multiple line layout subunit does | 01:21 |
| jelmer | jfroy: Can you paste an updated backtrace ? | 01:21 |
| jelmer | lifeless, ok, I'll see if I can provide a patch for that | 01:22 |
| jelmer | lifeless: We have lots of tests and usually only short explanations, this makes it a bit easier to read "raw" subunit streams | 01:22 |
| jfroy | done | 01:23 |
| lifeless | jelmer: I usually read the pyunit2unit output when debugging, as it has the lot | 01:24 |
| lifeless | jelmer: but sure, room for variation | 01:24 |
| jfroy | jelmer: so in PDB, prefixes is equal to the path that gets printed by the assertion | 01:29 |
| jfroy | which means it did path = prefixes[0].strip("/") | 01:30 |
| jfroy | probably not relevant :/ | 01:30 |
| jfroy | ascending is True | 01:30 |
| jelmer | the from_revnum / to_revnum tuple is swapped somewhere, I'm trying to find out where | 01:31 |
| jelmer | it usually doesn't matter, only if prefixes is not empty | 01:31 |
| jfroy | it's not | 01:31 |
| jelmer | from_revnum should be higher than to_revnum | 01:31 |
| jfroy | from_revnum=12189 to_revnum=12191 in repository.py(1114)find_branchpaths | 01:32 |
| jfroy | ditto for repository.py(1182)find_fileprop_paths | 01:33 |
| jelmer | I think I've found the place where this is going wrong, just running the testsuite now to check that I didn't break anything else | 01:33 |
| jfroy | same for find_branch_tips | 01:34 |
| jfroy | might be in revids.py(243)get_branch_revnum | 01:35 |
| jelmer | yeah, that's where I've swapped the two atm | 01:35 |
| jfroy | (Pdb) p last_revnum | 01:36 |
| jfroy | 12191 | 01:36 |
| jfroy | (Pdb) p last_checked | 01:36 |
| jfroy | 12189 | 01:36 |
| jfroy | in there | 01:36 |
| jfroy | layout is TrunkLayout(2) | 01:37 |
| jfroy | project is the prefix | 01:37 |
| jfroy | (same value as prefixes[0] in find_branchpaths) | 01:38 |
| ddaa | jelmer: actually, I reverted my quoting hack in my server. | 01:44 |
| ddaa | I had a broken link, apparently related to lack of escaping of "/" for a subdir branch. | 01:44 |
| lifeless | jam: ping | 02:12 |
| jelmer | jfroy, I've got a fix that should also improve performance in some situations | 02:16 |
| jelmer | jfroy, but still one test failing | 02:16 |
| jelmer | will push when I've fixed that | 02:16 |
| jfroy | jelmer: all good | 02:16 |
| jelmer | lifeless, oh btw, I've asked for a rename of bzr-rebase to bzr-rewrite on Launchpad | 02:37 |
| lifeless | heh | 02:37 |
| lifeless | so I've been thinking of doing a ground up recode | 02:37 |
| lifeless | but not necessarily for good reasons | 02:37 |
| jelmer | recode of rebase you mean? | 02:38 |
| lifeless | yeah | 02:39 |
| jfroy | huh | 02:39 |
| jfroy | people will get confused even more | 02:39 |
| jfroy | they're look for "rebase for bazaar" | 02:39 |
| jfroy | *they'll look | 02:39 |
| jelmer | lifeless: There's certainly a couple of improvements that can be made, I don't think there's much to gain in a rewrite from the grounds up rather than just fixing things gradually | 02:40 |
| lifeless | jelmer: I've found it hard to get code that fixes peoples issues into trunk | 02:41 |
| lifeless | jelmer: and there seemed to be a definitional tension | 02:41 |
| jelmer | lifeless, I don't think it's unreasonable for me to refuse patches that break the testsuite. | 02:41 |
| lifeless | jelmer: thats fine :), it was other ones | 02:42 |
| lifeless | by definitional I mean 'rebase vs replay vs ...' | 02:42 |
| jelmer | lifeless: So you're considering doing a rewrite based on a single discussion over an command parameter? | 02:43 |
| lifeless | I have a dream of having a single command that supports all the history rewrite operations we need | 02:43 |
| lifeless | jelmer: did I say 'not necessarily for good reasons' | 02:43 |
| jelmer | lifeless: I don't object to having such a command, and I think bzr-rewrite would be a good place. | 02:44 |
| jelmer | lifeless, I think it should be a different command from "bzr rebase" though, which is one of the reasons I asked for the rename of the plugin | 02:44 |
| jelmer | jfroy, the rebase plugin already includes more than just the rebase command, so I don't think it's unreasonable to have a different name for it | 02:47 |
| jfroy | That's true | 02:48 |
| lifeless | jelmer: https://code.edge.launchpad.net/~jelmer/bzr-search/merge is still empty | 03:13 |
| jelmer | lifeless, it was created using bzr send, I'll see if I can push to it manually | 03:14 |
| lifeless | also file a bug | 03:15 |
| jelmer | lifeless, pushed now | 03:15 |
| jelmer | jfroy, pushed | 03:32 |
| jfroy | jelmer: checking | 03:32 |
| jfroy | success | 03:33 |
| jfroy | you can close | 03:33 |
| jfroy | jelmer: you, sir, are awesome | 03:36 |
| jelmer | jfroy, :-) | 03:36 |
| * igc lunch | 03:59 | |
| lifeless | jelmer: so what does lp:~jelmer/subunit/subunitrunner | 04:11 |
| lifeless | do? | 04:11 |
| lifeless | spiv: ping | 04:42 |
| lifeless | spiv: [network deltas, hopefully you're awake now] | 04:42 |
| === timchen119 is now known as nasloc__ | ||
| spiv | lifeless: yes, I'm awake :) | 04:59 |
| lifeless | so for 2.0 we wanted to get network deltas gong | 05:00 |
| spiv | (I don't think my problem is jet lag so much as getting over ubuflu... I'm not having any trouble getting sleep at appropriate times, I just seem to need a lot more sleep than usual.) | 05:00 |
| lifeless | Yeah, I'm sleeping 9-10 hours, which is about 40% more than usual | 05:00 |
| Peng_ | "ubuflu"? | 05:00 |
| spiv | Peng_: the UDS plague. | 05:01 |
| mwhudson_ | Peng_: the result of uds, where lots of viruses get together and have a party | 05:01 |
| Peng_ | And you people wanted to invite me! :P | 05:01 |
| lifeless | its like an uberflu | 05:01 |
| lifeless | but with a kiwi accent | 05:01 |
| mwhudson_ | there are compensations | 05:02 |
| lifeless | interesting people | 05:02 |
| spiv | mwhudson_: true, I don't know how else I'd be able to fill a large bucket of snot... | 05:02 |
| Peng_ | Factoring in everybody sleeping 40% more than normal, was UDS really good for productivity? :D | 05:03 |
| fullermd | Well, that explains why I'm getting _less_ sleep than normal... obviously the cosmic balance is being maintained. | 05:07 |
| Peng_ | Wait, I am too. Scary. | 05:09 |
| * spiv -> food | 05:38 | |
| lifeless | spiv: so, are you still blocked onthe question you asked me monday week ago, or jam helped, or EILL | 06:01 |
| === abentley1 is now known as abentley | ||
| spiv | lifeless: I haven't looked at it at all, actually, so not sure if I'm blocked :) | 06:53 |
| spiv | lifeless: the UDS sprint was mostly on gc-stacking and nested-trees. | 06:53 |
| spiv | This week has been pretty slow (EILL), but I have caught up on a few things and fixed a regression for jml. | 06:54 |
| lifeless | yah | 07:00 |
| lifeless | I'm struggling | 07:00 |
| vila | hi all | 07:22 |
| vila | lifeless, spiv: me too EILL, at least I need far more sleep than usual, so not really ill but... | 07:23 |
| lifeless | abentley: FYI, hg is overhauling forests, 'subrepos' is what they are calling it | 07:24 |
| bob2 | is it going to be less silly? | 07:24 |
| lifeless | who knows | 07:24 |
| abentley | lifeless: I heard "nested repositories": http://bazaar-vcs.org/NestedTreesDesign#mercurial-nested-repositories | 07:25 |
| lifeless | abentley: mpm is talking subrepos in IRC on and off at the moment | 07:26 |
| lifeless | it may be a reference to cleaning up http://www.nabble.com/sub-repository-extension-td20345412.html | 07:26 |
| lifeless | or may be new code; I don't know | 07:27 |
| === abentley1 is now known as abentley | ||
| lifeless | blink | 07:44 |
| Peng_ | ? | 07:45 |
| lifeless | just realised the time | 07:46 |
| Peng_ | Ah. | 07:46 |
| Peng_ | Oh, 06:47, when my logs rotate (but not on this day of the week). | 07:47 |
| UUncia | What's the difference between checkout & branch? | 08:03 |
| lifeless | when you commit in a checkout, the commit goes both locally in the checkout, and also in some other branch that the checkout was made of | 08:05 |
| lifeless | its useful for maintainers of a project to all have a checkout of trunk | 08:05 |
| === abentley1 is now known as abentley | ||
| lifeless | halt() | 08:23 |
| Demosthenes | i want to start a new repo (tree?) and then import into it single files from multiple other repos while preserving the history for just those files. is that possible? | 09:17 |
| Demosthenes | i'm basically combining a document from three diff repos, but first i want to import the existing ones while preserving the log | 09:17 |
| === abentley1 is now known as abentley | ||
| sabdfl | hi folks - what's the status of initial commit and explicit-file commit with 2.0? | 09:43 |
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| awilkins | lifeless: Ping? | 11:13 |
| awilkins | Pah, Australians. Always 12 hours ago. | 11:14 |
| Kamping_Kaiser | pah. | 11:15 |
| balachmar | Hi, I want to share my code using bzr and sftp. Now I have setup a repo, but on the server there is no code, just the history. How do I set it up in a way, that there is code on my server as well? | 11:32 |
| awilkins | balachmar: Pushing via remote protocols does not update the tree | 11:33 |
| awilkins | balachmar: There is a plugin that executes a tree update via ssh | 11:34 |
| balachmar | ooh, I thought since, I didn't setup the remote tree with no-trees it would actually do it... | 11:34 |
| awilkins | Pushing a tree over SFTP would be more costly than the remote machine writing the tree | 11:35 |
| balachmar | is there a way to automate that? So that when I commit changes, the tree gets regenerated? | 11:36 |
| awilkins | push-and-update plugin http://bazaar-vcs.org/BzrPlugins | 11:38 |
| awilkins | Although there are thoughts about implementing it in the smart server rattling around on the mailing list | 11:38 |
| balachmar | ok, will just do it manually for now then. Thanks for the info | 11:47 |
| Peng_ | Even now, you could probably use a hook in the hpss? | 11:48 |
| === mrevell is now known as mrevell-lunch | ||
| RockyRoad | hi :) | 13:07 |
| RockyRoad | I tried to use uncommit. It work on local copy, but I could not reflect it on launchpad. Is it possible ? | 13:08 |
| RockyRoad | it works* | 13:09 |
| === Kissaki^0ff is now known as Kissaki | ||
| luks | you can "push --overwrite" probably | 13:30 |
| luks | but be careful with that | 13:30 |
| === mrevell-lunch is now known as mrevell | ||
| cdecarlo | hi, I've set my authentication.conf to this: http://pastie.org/500323 but when I try to access my home computer with bzr+ssh://, it times out waiting on port 22? is there something wrong with the .conf? | 13:58 |
| luks | I can't help you with authentication.conf, but I'd use ~/.ssh/config for this | 13:59 |
| vila | cdecarlo: as luks said, .ssh/config is more appropriate, especially if you want port 2662 to be used | 14:00 |
| cdecarlo | luks: It never occured to me to try that, thanks, I'm always interested in other ways to skin cats ;) | 14:00 |
| cdecarlo | out of curiosity then, why then does bzr support those options in it's authentication.conf? | 14:01 |
| vila | cdecarlo: authentication.conf purpose is different, it said: *if* you use port 2662 then user is 'colin', whereas .ssh/config allows you to say *if* connection goes to example.com then *use* port 2662 | 14:01 |
| cdecarlo | vila: ah | 14:01 |
| cdecarlo | thanks | 14:02 |
| vila | cdecarlo: the main purspose of authentication.conf is to provide some facilities to protocols *other* than ssh, .ssh/config and ssh agents are not available for all protocols :) But auth.conf doesn't even try to replace them | 14:03 |
| vila | for ssh | 14:03 |
| cdecarlo | that would make a great note in the user docs, does bzr use trac or something similar? | 14:04 |
| vila | cdecarlo: http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#authentication-settings says "SFTP can use either a password or a host key to authenticate. However, ssh agents are a better, more secure solution. So we have chosen to not provide our own less secure method." | 14:09 |
| vila | cdecarlo: but if you can think of a better way to say that or other places where it should be pointed at, feel free to send a patch. The sources are under the 'doc' directory in bzr | 14:10 |
| pygi | hi folks | 14:10 |
| === nevans1 is now known as nevans | ||
| cdecarlo | vila: thanks, I'll try to think of something | 14:16 |
| vila | pygi: hi | 14:17 |
| nickoe | Hi | 14:34 |
| nickoe | I can't seem to find out how I should setup a repo on a ftp server. | 14:35 |
| nickoe | Can YOU help me? | 14:35 |
| vila | nickoe: 'bzr init ftp://example.com/path/to/branch' should create a empty branch | 15:00 |
| nickoe | vila, how should I then use t correctly? | 15:21 |
| vila | bzr push ftp://example.com/path/to/branch from your local branch | 15:22 |
| vila | 'bzr push ftp://example.com/path/to/branch' from your local branch | 15:22 |
| nickoe | that is if I already got a branch on locally, right? | 15:23 |
| vila | nickoe: yes | 15:23 |
| === abentley1 is now known as abentley | ||
| nickoe | vila, then tha same data is locally and on the ftp, right? | 15:24 |
| vila | except for the working tree, yes | 15:25 |
| vila | uncommitted changes are not pushed either | 15:25 |
| nickoe | Okay. But the fact that the working tree is not on ftp, means that you actually can't download a revision from the server? | 15:26 |
| vila | nickoe: no, it means the ftp branch has no working tree, but it can be used to branch or pull from other clients | 15:27 |
| vila | nickoe: if you never login with a shell on the ftp server, you don't care about the working tree | 15:28 |
| nickoe | okay, so antoher user can use bzr checkout ftp://bla.com/path to get the latest revision, or? | 15:31 |
| nickoe | Seems to be working now. vila thank you | 15:37 |
| vila | nickoe: always happy to help (TM) | 15:37 |
| nickoe | But why do I have to type the ftp password all the time? vila | 15:38 |
| vila | nickoe: because your server requires a password ? :-) | 15:39 |
| === thunderstruck is now known as gnomefreak | ||
| vila | nickoe: what os/version are you using ? | 15:40 |
| nickoe | linux | 15:40 |
| nickoe | ubuntu 9.04 | 15:40 |
| vila | nickoe: so authentication.conf is the way to go | 15:41 |
| vila | nickoe: is sftp an option on the server side ? Or is the server not under your control ? | 15:41 |
| nickoe | sftp not an option atm | 15:41 |
| vila | nickoe: too bad, keys and ssh agents are more secure, anyway, have a look at http://doc.bazaar-vcs.org/bzr.dev/en/user-reference/bzr_man.html#authentication-settings | 15:42 |
| nickoe | yes I know, but not an option atm... | 15:42 |
| nickoe | :-/ | 15:42 |
| vila | nickoe: is that server public or on a private LAN ? | 15:44 |
| nickoe | well it is public, but the information on it is just temporary | 15:44 |
| vila | nickoe: np, I was just trying to better understand your use case | 15:45 |
| nickoe | k | 15:45 |
| nickoe | But I will thank you once again | 15:47 |
| jam | morning vila | 15:59 |
| vila | jam: hi ! | 15:59 |
| === mvo_ is now known as mvo | ||
| rbriggsatuiowa | my unshelve command failed miserably | 16:11 |
| rbriggsatuiowa | bzr: ERROR: exceptions.NotImplementedError: <property object at 0xee8d70> | 16:11 |
| rbriggsatuiowa | I'm not entirely sure what's in my shelf - where can I find what the contents are? | 16:11 |
| rbriggsatuiowa | cat .bzr/checkout/shelf/shelf1 | 16:12 |
| rbriggsatuiowa | nice | 16:12 |
| === mario__ is now known as pygi | ||
| jfroy | Morning. | 19:09 |
| jfroy | I was wondering if there was a way to have bzr stomp all over my working tree when switching branch. | 19:10 |
| jam | jfroy: ? you mean touch everything? | 19:24 |
| * garyvdm is trying to catch up on email. I've had no internet since I got back from the sprint. | 19:30 | |
| pygi | garyvdm: :p | 19:36 |
| pygi | I've told you not to cut the wires! | 19:36 |
| garyvdm | haha | 19:36 |
| jfroy | jam: sorry, I got dragged away | 19:42 |
| jfroy | so my problem is that I have some branches which have file foo/bar versioned, and some later branches that do not (they generate foo/bar) | 19:42 |
| jfroy | and when switching from a branch that generates foo/bar to a branch that versions the file, I get a content conflict | 19:43 |
| jfroy | I'd rather just have bzr blow away files it needs to check out from the branch | 19:43 |
| jfroy | I understand it cannot be default behavior, but a flag would be useful | 19:43 |
| jam | jfroy: well, there is always "bzr switch; bzr reverT" | 19:44 |
| jfroy | true | 19:45 |
| jfroy | that's what I do right now, and it works well, but I'm lazy :p | 19:45 |
| jam | bzr switch --hard ? | 19:47 |
| jam | bzr switch --and-reset | 19:47 |
| jam | bzr switch --and-revert | 19:47 |
| dash | --nuclear-option | 19:48 |
| jelmer | jam, ping | 19:58 |
| jam | jelmer: pong | 19:58 |
| jelmer | I'm looking at bug 246880 and wondering how it relates to the bug we worked on during UDS | 19:59 |
| ubottu | Launchpad bug 246880 in bzr "ghost fetch issue: fail when fetching a text referenced by a live revision introduced by a ghost revision" [High,Triaged] https://launchpad.net/bugs/246880 | 19:59 |
| jelmer | the original error is different (line delta missing) but the reconcile problem should be fixed now | 19:59 |
| jelmer | nevermind, enough other ghost bugs open :-/ | 20:15 |
| LarstiQ | evening | 20:22 |
| garyvdm | evening LarstiQ | 20:23 |
| pygi | garyvdm: reviewed my patch yet? :p | 20:23 |
| LarstiQ | heya gary | 20:23 |
| * pygi hides | 20:23 | |
| garyvdm | pygi: No :-( - Had no internet. Will do it Now! | 20:24 |
| pygi | garyvdm: xD | 20:24 |
| jelmer | Peng, is there anything that's enabled by --allow-writes atm or is it there in preparation of the smart server support? | 21:38 |
| === GaryvdM_Windows_ is now known as GaryvdM_Windows | ||
| pygi | GaryvdM_Windows: ! | 21:49 |
| === mwhudson_ is now known as mwhudson | ||
| Snova | If I deleted a file in revision 5, and am now at revision 10, what is the best way to get that file again? | 22:31 |
| jam | Snova: bzr revert -r 5 filename | 22:33 |
| Snova | Thank you. :) | 22:34 |
| unutbu | jam: thanks | 22:34 |
| Noldorin | hi. i'm trying to create a branch on launchpad but am getting the following error: | 22:44 |
| Noldorin | bzr: ERROR: Target directory "lp:darwindotnet/0.1" already exists. | 22:44 |
| Noldorin | the branch clearly hasn't been pushed to yet. | 22:46 |
| Noldorin | any ideas? | 22:46 |
| garyvdm | luks: What are your thoughts who copyright is assigned to in the license headers in qbzr? | 22:51 |
| garyvdm | If someone adds a new file, they should assign the copyright to them selves? | 22:51 |
| mwhudson | Noldorin: try passing --use-existing-dir to push | 22:53 |
| Noldorin | mwhudson: i'm attempting to branch directly to a separate launchpad branch. is that the wrong way to be doing it? | 22:53 |
| mwhudson | oh | 22:54 |
| Noldorin | (bzr branch doesn't have the --use-existing-dir option) | 22:54 |
| mwhudson | well, i'm certainly not sure that that would work | 22:54 |
| Noldorin | i see | 22:54 |
| Noldorin | i wanted to do that mainly so i can link the local and master branches in sync | 22:55 |
| Noldorin | but maybe i can do that another way? | 22:55 |
| Noldorin | mwhudson: i haven't quite figured out how i linked the master and local branches for my devel branch! | 22:56 |
| mwhudson | um | 22:58 |
| mwhudson | what do you mean by local ? | 22:58 |
| mwhudson | i don't see why you'd have two branches with perpetually the same content on launchpad | 22:58 |
| Noldorin | local as in on my drive | 22:58 |
| Noldorin | what do you mean perpetually the same content? | 22:58 |
| Noldorin | mwhudson: ? | 22:59 |
| mwhudson | oh | 22:59 |
| mwhudson | Noldorin: have you come across bzr bind ? | 22:59 |
| Noldorin | and master as in on launchpad | 22:59 |
| Noldorin | mwhudson: no i haven't | 22:59 |
| mwhudson | Noldorin: i think that's what you want | 23:00 |
| Noldorin | ah i think you could be right. | 23:00 |
| Noldorin | mwhudson: right, so i just tried bzr bind. it gives me the following error: | 23:04 |
| Noldorin | bzr: ERROR: xmlrpc protocol error connecting to https://xmlrpc.edge.launchpad.ne | 23:04 |
| Noldorin | t/bazaar/: 503 Service Unavailable | 23:04 |
| Noldorin | sorry | 23:04 |
| Noldorin | bzr: ERROR: xmlrpc protocol error connecting to https://xmlrpc.edge.launchpad.net/bazaar/: 503 Service Unavailable | 23:04 |
| mwhudson | ! | 23:04 |
| mwhudson | maybe try again? | 23:04 |
| mwhudson | that's definitely not supposed to happen | 23:04 |
| garyvdm | launchpad is currently offline. | 23:05 |
| Noldorin | yeah, i've already tried several times | 23:05 |
| Noldorin | oh lol | 23:05 |
| pygi | garry has spoken | 23:05 |
| Noldorin | it must have gone offline just as i have been talking with you | 23:05 |
| garyvdm | http://blog.launchpad.net/notifications/launchpad-offline-2200-2210-utc-4th-june | 23:05 |
| Noldorin | never mind then | 23:05 |
| Noldorin | garyvdm: thanks | 23:05 |
| Noldorin | mwhudson: i think bind is my solution anyway. cheers :) | 23:05 |
| === Isaiah1 is now known as Isaiah | ||
| garyvdm | Noldorin: lp's back up | 23:24 |
| Noldorin | garyvdm: yeah, just noticed. cheers | 23:28 |
| Noldorin | mwhudson: just ran bzr branch, and this error message truly seems to be strange: | 23:28 |
| Noldorin | bzr: ERROR: Not a branch: "bzr+ssh://bazaar.launchpad.net/~noldorin/darwindotnet/0.1/". | 23:28 |
| Noldorin | because it certainly is a branch | 23:28 |
| mwhudson | Noldorin: "https://code.edge.launchpad.net/~noldorin/darwindotnet/0.1" says "This branch has not been pushed to yet." | 23:29 |
| mwhudson | Noldorin: sadly, "registering a branch" in the web ui doesn't actually create a branch that bzr can use | 23:30 |
| Noldorin | but i want to initiate it by branching to it | 23:30 |
| mwhudson | Noldorin: push your branch up first | 23:30 |
| Noldorin | mwhudson: ah i see. | 23:30 |
| Noldorin | will do then | 23:30 |
| Noldorin | mwhudson: thanks. all seems to be working now :) | 23:31 |
| mwhudson | Noldorin: hooray :) | 23:32 |
| Noldorin | mwhudson: linked branches just seems to be turning BZR into SVN, but oh well... | 23:33 |
| dash | Noldorin: that's the entire point :) | 23:34 |
| Noldorin | (bound branches) | 23:34 |
| mwhudson | Noldorin: well, a bit, yes | 23:34 |
| dash | you can treat the results of 'bzr co' and 'svn co' very similarly :) | 23:34 |
| Noldorin | yeah, not that it's entirely a bad thing. | 23:34 |
| Noldorin | it should work fairly well while i'm the only dev on this project at least | 23:34 |
| Noldorin | dash: yeah, i suspected so | 23:35 |
| tsmithe | hi - how would i go about using bzrlib to determine the timestamp of the initial commit of a given file? i've looked around in WorkingTree, Branch and Inventory, and haven't really found anything useful. also, weirdly, bzrlib.log.find_touching_revisions(b, w.inventory.path2id(p)) doesn't seem to work, where "b" is the BzrBranch object, w WorkingTree and p the str path. | 23:38 |
| tsmithe | (as in, nothing is returned) | 23:38 |
| === Kissaki is now known as Kissaki^0ff | ||
| garyvdm | tsmithe: I would think that find_touching_revisions is the right way to go (or something similar.) | 23:43 |
| garyvdm | tsmithe: can you check that bzr log p gives you what you want? | 23:45 |
| garyvdm | The last line of the output? | 23:45 |
| tsmithe | yes, yes it does. the last line of the output is the commit message for the first commit. | 23:46 |
| garyvdm | Ok - let me go look at bzrlib.log.find_touching_revisions | 23:47 |
| tsmithe | i created w with WorkingTree.open, and b with BzrBranch.open; both on the same path. | 23:47 |
| tsmithe | garyvdm: thanks | 23:47 |
| pygi | garyvdm: you managed to review the patch! | 23:49 |
| garyvdm | pygi: :-) | 23:50 |
| pygi | congratulations :p | 23:50 |
| pygi | garyvdm: btw. I found the atl solution ... I think :P | 23:50 |
| pygi | jam ^_^ | 23:50 |
| garyvdm | pygi: I have not done much work on tbzr - so when I review the patch - I was reading the related code - so that I can also get to know it better. | 23:51 |
| pygi | I still wish I had time to work on that :-/ | 23:52 |
| pygi | I think its a bit too complex for no real reason | 23:52 |
| pygi | I might be wrong tho | 23:52 |
| garyvdm | pygi: Cool. | 23:52 |
| pygi | garyvdm: how is that cool? :p | 23:52 |
| garyvdm | Pygi - there was a delay - The fact that you may have found a atl fix is cool :) | 23:53 |
| garyvdm | The fact the you don't have time to work on it is not :( | 23:54 |
| garyvdm | One day I'll invent a machine to give us more hours in a day... | 23:55 |
| pygi | well, I've told you I'd use that to guard lambs... | 23:55 |
| pygi | enough of technology :P | 23:55 |
| pygi | s/take care/guard/ | 23:56 |
| garyvdm | tsmithe: you can use BzrDir.open_tree_or_branch to open the tree and branch in one command. | 23:57 |
| tsmithe | i'll try that; thanks | 23:59 |
| garyvdm | tsmithe: Take a look at _filter_revisions_touching_file_id in log.py | 23:59 |
| tsmithe | right, i'll do that too | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!