| lifeless | KhaZ: should be fine, if you're talking about a place to push and pull from | 00:02 |
|---|---|---|
| KhaZ | Aye. Alright, I'll give that a shot. Thanks. | 00:04 |
| lifeless | best performance would be to use bzr+ssh | 00:05 |
| lifeless | if you only have LAN's though file:// is fine | 00:05 |
| KhaZ | Yeah. We'll see; maybe I'll switch over to installing SSH on Windows sometime; but I'll try out samba for now. | 00:17 |
| lifeless | the bzr install comes with bzr+ssh support, you just need pageant | 00:21 |
| lifeless | (I think) | 00:21 |
| KhaZ | Right; but it doesn't set up a server, does it? | 00:28 |
| KhaZ | i.e., if I have two fresh windows boxes, and I use the bzr installer, it won't set up an svn server such that I acn push/pull between the two, I think? | 00:28 |
| lifeless | s/svn/bzr/ ? :P | 00:29 |
| lifeless | no it won't, but samba implies that you have a unix machine there anyway ;) | 00:29 |
| lifeless | unless you meant SMB rather than Samba. | 00:29 |
| KhaZ | Sorry, I should mention, "Windows Sharing", not samba. | 00:29 |
| KhaZ | Yeah; SMB, rather. I just always spell out samba. | 00:29 |
| KhaZ | My bad. | 00:29 |
| lifeless | np | 00:29 |
| KhaZ | *spell it out as Samba, implying they're the same when they're not. | 00:29 |
| lifeless | igc: so, CHKInventorypath2id is doing much more work than needed | 02:14 |
| lifeless | igc: I'm fixing it. | 02:14 |
| igc | lifeless: thank-you, thank-you, thank-you | 02:14 |
| igc | lifeless: lots of performance hot spots will be improved by doing that I suspect | 02:15 |
| lifeless | igc: its this todo: | 02:16 |
| lifeless | # XXX: Todo - use proxy objects for the children rather than loading | 02:16 |
| lifeless | # all when the attribute is referenced. | 02:16 |
| lifeless | however, I'm not going to do the todo, for now I'm just going to fix path2id directly | 02:16 |
| lifeless | igc: for reference, just double clicking on the path2id node in the profile shows it doing 300 IO's | 02:19 |
| lifeless | igc: which gives a hint that its doing more work than needed :P | 02:19 |
| igc | lifeless: in kcachegrind? That doesn't work for me? What panel? | 02:21 |
| lifeless | igc: callee map | 02:28 |
| lifeless | igc: the tree - double click on the path2id bzrlib.inventory:1993 line | 02:29 |
| lifeless | s/line/node | 02:30 |
| lifeless | actually, its not the callee map, the UI confused me | 02:30 |
| lifeless | its the 'call graph' | 02:30 |
| lifeless | I'm just testing the fix now | 02:31 |
| lifeless | igc: rev 4544 should be good | 03:19 |
| lifeless | igc: all review feedback applied; bugs fixed, path2id hopefully faster | 03:19 |
| igc | lifeless: cool. I'm wrapping up a patch and have a medical appointment after lunch. I'll take a look after that | 03:21 |
| lifeless | igc: cool. it would be great if we can get this assessed before ~3, when my day ends. | 03:22 |
| lifeless | (I'm still being woken up silly-early by neighbours :( ) | 03:22 |
| igc | lifeless: my medical appt is 2.40 so I suspect before 3 is unlikely sorry | 03:24 |
| lifeless | ah well | 03:24 |
| lifeless | monday then | 03:24 |
| lifeless | fullermd: ping :) where should I file a bug about lt2.x ? | 03:33 |
| pattern | according to this tutorial http://doc.bazaar-vcs.org/latest/en/tutorials/using_bazaar_with_launchpad.html#publishing-your-changes | 03:44 |
| pattern | i can push my changes to launchpad via: "bzr push lp:~team-name/project-name/branch-name" | 03:44 |
| pattern | but what if my project is not part of any team? | 03:44 |
| lifeless | replace team-name with your name | 03:45 |
| lifeless | (lp usercode actually) | 03:45 |
| lifeless | lunching | 03:45 |
| pattern | sorry, i don't understand the last two lines of what you said | 03:47 |
| pattern | lp usercode? lunching? | 03:47 |
| pattern | was that meant in answer to my question? | 03:47 |
| pattern | or were you anouncing you were going out to lunch? :) | 03:47 |
| garyvdm | pattern: I think so | 03:47 |
| spiv | pattern: he's going out to lunch :) | 03:48 |
| pattern | ok... just checking :) | 03:48 |
| garyvdm | so I would push to lp:~garyvdm/qbzr/./// | 03:48 |
| spiv | pattern: but his 2nd last line was to you :) | 03:48 |
| garyvdm | so I would push to lp:~garyvdm/qbzr/.... | 03:48 |
| spiv | pattern: i.e. I generally push to lp:~spiv/bzr/branch-name | 03:48 |
| pattern | got it | 03:49 |
| pattern | thank you everyone | 03:49 |
| spiv | The ~name at the start controls who Launchpad grants write access to. If it's a team, the whole team can update the branch. If it's just a person, then only that person. | 03:50 |
| jml | (for now) | 03:51 |
| pattern | so how can people submit patches to projects that aren't part of a team? | 03:52 |
| pattern | (assuming they don't control the branch) | 03:52 |
| garyvdm | pattern: They can request a merge | 03:52 |
| garyvdm | by the person that does | 03:52 |
| garyvdm | They do that by pushing to a branch in their own name | 03:53 |
| garyvdm | If you do have more than one person that needs to push to the mainline of a project, it's easy to get a team created. | 03:53 |
| pattern | my project is very small right now | 03:54 |
| pattern | i don't think i need a team | 03:54 |
| garyvdm | jml: You got me to bite - tell me more... | 03:55 |
| pattern | just trying to understand how i can get contributions from others | 03:55 |
| mwhudson | garyvdm: i think jml is talking about package branches | 03:55 |
| mwhudson | where it will become a bit more subtle for the official branches | 03:55 |
| jml | what mwhudson said. | 03:57 |
| spiv | pattern: they can email you with the contribution. There's a "bzr send" command that will even make a mail with the new bzr revisions as an attachment for you. | 03:57 |
| spiv | pattern: or you could "bzr merge" (or "bzr pull") from their branch if they've published it somewhere (e.g. on Launchpad).o | 03:58 |
| spiv | pattern: Launchpad has a merge proposal tracker as well, so you could ask contributors to use that to submit patches. | 03:58 |
| spiv | pattern: basically, the two questions are "how do you want contributors to contact you about their contributions?" (e.g. email to a particular address) and "how do you want to receive the contributions?" (e.g. a bundle in an email from bzr send, or by using a branch they've published somewhere, etc.) | 04:00 |
| pattern | that merge proposal tracker sounds interesting | 04:05 |
| pattern | where can i find out more about it? | 04:07 |
| spiv | pattern: https://help.launchpad.net/Code/Review is probably a good starting point. | 04:12 |
| garyvdm | pattern: https://help.launchpad.net/, https://help.launchpad.net/Code/Review | 04:12 |
| * spiv also goes to lunch :) | 04:12 | |
| pattern | thank you very much | 04:13 |
| lifeless | jml: I think its really really clear as it is today | 04:14 |
| lifeless | jml: When you look at DACL in windows and posix they are generally a lot more complex and harder to understand | 04:15 |
| igc | lifeless: initial benchmarking looks much better thanks | 04:15 |
| jml | lifeless, | 04:15 |
| lifeless | igc: cool | 04:16 |
| igc | lifeless: I'll run the full benchmark over lunch (it takes 90 minutes) | 04:16 |
| lifeless | jml: (just saying) | 04:16 |
| igc | thanks to the 'speed' of branching outside a repo | 04:16 |
| jml | lifeless, yeah. it _is_ less clear to have people with implicit write permissions, but it's something the distro community really really want, and we think the loss of clarity is worth it. | 04:17 |
| lifeless | jml: for the distro official branches I totally agree | 04:17 |
| lifeless | well | 04:18 |
| lifeless | I totally get the need, and that we need to support that | 04:18 |
| lifeless | I'm not 100% on board the particular way to address that | 04:18 |
| lifeless | that said, one way to phrase it would be that distro official branches have an implicit per-branch team that we just elide from the namespace | 04:19 |
| lifeless | which is...roundabout | 04:19 |
| jml | yes. | 04:20 |
| lifeless | oh, ETA? | 04:20 |
| jml | difficult to say. | 04:21 |
| jml | it's a one or two day patch, and my highest priority task. | 04:21 |
| jml | so probably in two or three weeks time. | 04:21 |
| lifeless | Actually, I meant you, at my place. | 04:22 |
| lifeless | I'm assuming that the changes for the distro are either not applicable, or at least optional, for other branches ;) | 04:23 |
| jml | ~6:30pm? | 04:23 |
| lifeless | sure, earlier is fine if you like; later and I'll be climbing up the walls in search of food | 04:23 |
| jml | I'll try to get there earlier, but I doubt it'll happen -- there's a lot to do before then. | 04:25 |
| jml | lifeless, bug 397705 is targeted to 1.17. Is there still more stuff to land for 1.17? | 04:32 |
| ubottu | Launchpad bug 397705 in bzr "inventory delta consistency checks are missing known problems and not universally applied." [Critical,Fix committed] https://launchpad.net/bugs/397705 | 04:32 |
| * RenatoSilva is thinking about suggesting his boss to leave CVS and start using Bazaar... | 04:35 | |
| lifeless | jml: there is more on that branch | 04:37 |
| lifeless | jml: it doesn't have to go in 1.17; its waiting review at the moment. | 04:37 |
| lifeless | jml: It probably speeds up a bunch of things (while slowing down others just a data, and becoming faster at the same time) | 04:38 |
| jml | lifeless, I don't grok the bit in parens. | 04:38 |
| jml | spm, how does bazaar's pqm spell the name of the 1.17 branch? | 04:41 |
| spm | jml: do you mean: https://code.edge.launchpad.net/~bzr-pqm ? | 04:42 |
| jml | not quite | 04:42 |
| jml | merge http://bazaar.launchpad.net/~jml/bzr/1.17-build-updates lp:bzr/1.17 | 04:42 |
| jml | Command failed! | 04:42 |
| jml | All lines of log output:Sender not authorised to commit to branch lp:bzr/1.17 | 04:42 |
| jml | that's what I get when I try to land a branch to 'lp:bzr/1.17' | 04:42 |
| spm | ah right, one sec | 04:42 |
| igc | lifeless: starting the full benchmark now. Still issues with the test suite btw - see the associated bug for details. | 04:43 |
| * igc lunch & medical stuff - bbl | 04:43 | |
| spm | jml: bzr+ssh://bazaar.launchpad.net/~bzr-pqm/bzr/1.17 | 04:43 |
| jml | spm, thanks. | 04:44 |
| lifeless | igc: thanks | 04:52 |
| lifeless | jml: or http://<same> | 04:53 |
| lifeless | igc: thanks | 04:56 |
| lifeless | igc: I've switched context to another bug but I'll fix those up later | 04:56 |
| lifeless | igc: I'm sure any other changes won't have performance implications | 04:56 |
| lifeless | jam: abentley: could you please move the conversation out of bug 390563? That bug is for a totally different cause, and *still* hasn't had all its code changes landed. | 05:23 |
| ubottu | Launchpad bug 390563 in bzr "absent factory exception from smart server when streaming 2a stacked branches" [Critical,In progress] https://launchpad.net/bugs/390563 | 05:23 |
| abentley | lifeless: I don't want to disrupt the conversation. | 05:24 |
| lifeless | abentley: I'd be happy to copy over the last few posts to the correct bug if that would help | 05:25 |
| lifeless | its a shame malone doesn't provide facilities to remix bug conversations | 05:26 |
| abentley | lifeless: Nevermind, I can drag it to the list if I have more questions for jam. | 05:26 |
| lifeless | abentley: I don't want to prevent important discussions; I'm just worried that its making it harder to have the discussion about delta generation thats also on the same bug :( | 05:28 |
| abentley | lifeless: I understand. | 05:28 |
| jml | committing a tarball of bzr to a bzr branch | 05:31 |
| jml | no irony at all | 05:31 |
| lifeless | jml: buildout? | 05:32 |
| jml | yeah. | 05:32 |
| lifeless | I'm very unconvinced | 05:34 |
| garyvdm | Can any one word this more elegantly: | 05:36 |
| garyvdm | "You are reverting all changed files. Are you sure that you don't also want to revert pending merges?" | 05:36 |
| garyvdm | Warning for when a user tries to revert all file, and not pending merges from qrevert. | 05:37 |
| lifeless | perhaps | 05:37 |
| lifeless | "You are reverting all changed files but leaving some pending merges. Do you want to [also revert the merges] [revert the changed files] [cancel the revert]" | 05:37 |
| lifeless | tweaking | 05:40 |
| lifeless | "You are reverting all changed paths without also reverting pending merges. Do you want to [also revert pending merges] [revert all changed paths without merges] [cancel the revert]" | 05:41 |
| garyvdm | "You are reverting all changed paths without also reverting pending merges. Continue?" [Yes] [No] | 05:42 |
| garyvdm | The ability to chose the other option is provided by the dialog: http://imagebin.ca/view/nys-K4s.html | 05:42 |
| garyvdm | Thanks lifeless. - That sound much better. | 05:43 |
| lifeless | my pleasure | 05:45 |
| garyvdm | Morning amanica. Up early! | 05:53 |
| amanica | garyvdm: morning, couldn't sleep. | 05:53 |
| amanica | you too btw. wasn't gonna say something | 05:53 |
| garyvdm | I'm working night shift - then I hack after work and sleep during the day. | 05:54 |
| amanica | I blame lifeless, for complaining about stuff I did :) | 05:54 |
| amanica | ah ok | 05:54 |
| amanica | once your mind keeps on drafting that mail, its over | 05:55 |
| === abentley1 is now known as abentley | ||
| davidstrauss | All the Bazaar-nics should appreciate this: http://www.chapterthree.com/blog/josh_koenig/project_mercury_preconfigured_drupalvarnish_ec2_ami | 06:07 |
| davidstrauss | It's a Drupal-based AMI that auto-updates using Bazaar | 06:07 |
| lifeless | sweet | 06:08 |
| lifeless | oh wow | 06:26 |
| lifeless | don't you love OMG bugs | 06:26 |
| poolie | mm, sometimes | 06:40 |
| poolie | lifeless: did you want to talk about anything in particular wrt hpssvfs? | 06:40 |
| lifeless | no, I was making a meta comment; that the patch is trivial enough to just land, but if discussion is sought perhaps the list works better. I don't know - still tossing ideas around | 06:41 |
| lifeless | I have a rathole bug at the moment | 06:41 |
| lifeless | revert -> tree transform -> iter_changes -> find_ids_across_trees | 06:41 |
| poolie | ah ok | 06:42 |
| poolie | will let you back to it | 06:42 |
| poolie | going into code myself if i'm lucky... | 06:42 |
| lifeless | abentley: are you around still? Do you have an opinion on tree.has_id for missing paths? | 06:45 |
| lifeless | \o/ got that bug fixed | 07:08 |
| lifeless | amanica: you may be interested in https://bugs.edge.launchpad.net/bzr/+bug/129880 | 07:08 |
| ubottu | Ubuntu bug 129880 in bzr "Can't bzr rm a directory that contained a modified+emigrated file" [Medium,Confirmed] | 07:08 |
| vila | hi all | 07:29 |
| amanica | lifeless: thanks, sure, I'll append it to my evergrowing todo list | 07:32 |
| amanica | good morning vila | 07:32 |
| vila | amanica: Hey ! | 07:32 |
| igc | back | 07:41 |
| igc | hi vila! | 07:41 |
| vila | igc: hi | 07:42 |
| * spiv -> gone | 08:27 | |
| vila | amanica: ping | 08:52 |
| amanica | vila: pong | 08:59 |
| vila | I see you wanted to work on bzr mv again, so I wanted to talk a bit about some problems I encoutered on OSX and that seem to be related | 09:00 |
| vila | amanica: roughly, If unicode paths are used and BzrMoveFailedError and derived classes are used, things go wrong | 09:01 |
| vila | amanica: So if you touch that code again, make sure to add tests with unicode paths, and if you can test that on OSX, that would be even better, but I don't know if you have that available :) | 09:02 |
| jml | lifeless, leaving now. | 09:03 |
| amanica | vila: I'll make a note, thanks. I only have ubuntu | 09:03 |
| vila | amanica: ok, thanks :) | 09:04 |
| lifeless | jml: cusoon | 09:04 |
| * igc dinner | 09:25 | |
| jelmer | mwhudson: hi | 09:58 |
| jelmer | mwhudson: do you have any remaining failing imports from git? | 09:58 |
| mwhudson | jelmer: i had one that failed because of submodules | 09:59 |
| mwhudson | jelmer: i guess i should be systematic about it at some point | 10:01 |
| mwhudson | not at 2100 on a friday tho | 10:01 |
| jelmer | :-) | 10:04 |
| asabil | jelmer: I have a failing bzr branch with for a git repo | 10:22 |
| jelmer | asabil: what git repo? | 10:23 |
| jelmer | asabil: and what's the error? | 10:23 |
| asabil | git://github.com/280north/cappuccino.git | 10:23 |
| asabil | invalid revision None | 10:23 |
| asabil | couldn't get a complete traceback | 10:23 |
| asabil | bzr: ERROR: The branch git://github.com/280north/cappuccino has no revision None. | 10:25 |
| asabil | that's the exact error | 10:25 |
| jelmer | asabil: I can reproduce it, please file a bug | 10:34 |
| asabil | jelmer: ok will do thanks | 10:38 |
| asabil | jelmer: any idea about why bzr-rebase would fail with this: | 10:48 |
| asabil | NoSuchRevision: KnitPackRepository('file:///home/asabil/main-1.14/.bzr/repository/') has no revision ('stian.selnes@tandberg.com-20090610132048-1mk36vuwwxv7zz0c',) | 10:49 |
| jelmer | asabil: not without context | 10:50 |
| asabil | jelmer: just rebasing a branch on top of another one | 10:51 |
| asabil | nothing really specific | 10:51 |
| asabil | bzr check and bzr reconcile are running fine | 10:51 |
| asabil | jelmer: here is the traceback: http://bzr.pastebin.com/d5186bfe2 | 11:00 |
| LarstiQ | jelmer: I notice you released bzr-svn 0.6.3 but I didn't see a release mail, want me to write and send it to bazaar-announce? | 13:16 |
| jelmer | LarstiQ: please do | 13:18 |
| jelmer | LarstiQ: and thanks for doing so | 13:18 |
| LarstiQ | jelmer: ETA tonight or tomorrow noon/afternoon | 13:18 |
| jelmer | LarstiQ: np, thanks again | 13:22 |
| * jelmer waves from DebCamp | 13:22 | |
| LarstiQ | jelmer: ooh, say hi to Dato | 13:23 |
| LarstiQ | and maybe more when I figure out they're there ;) | 13:23 |
| mgedmin | so, bzr can't handle non-ascii content, or what? | 14:16 |
| mgedmin | https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/400670 | 14:16 |
| ubottu | Ubuntu bug 400670 in bzr "bzr log -p UnicodeDecodeError" [Undecided,New] | 14:16 |
| jelmer | LarstiQ: will do, if I can figure out who dato is :-) | 14:17 |
| fullermd | mgedmin: Works fine for me. | 14:18 |
| mgedmin | newer bzr? | 14:18 |
| spiv | lifeless, jml: hooray for testresources! | 14:18 |
| mgedmin | fullermd: did you try with lp:zodbbrowser? | 14:18 |
| * spiv -> zzz | 14:18 | |
| fullermd | Exactly the branch and rev in the bug. | 14:18 |
| mgedmin | which bzr version? | 14:19 |
| lifeless | fullermd: so, up for some yak shaving? | 14:19 |
| lifeless | spiv: thanks | 14:19 |
| * mgedmin checks if he still has a copy of bzr trunk | 14:19 | |
| jml | spiv, thanks :) | 14:19 |
| fullermd | The error message says it's trying to convert it to ascii, which suggests bzr isn't liking your locale. | 14:19 |
| abentley | jelmer: Am I right thinking that bzr-git doesn't support submodules and won't support them until Nested Trees works? | 14:19 |
| jelmer | abentley: yep | 14:19 |
| fullermd | (though you are a few versions back, and there may have been a bug fixed... none comes to mind) | 14:20 |
| fullermd | lifeless: I left my clippers in my other pants. | 14:20 |
| fullermd | Too much work and errands today to have time for much... | 14:21 |
| mgedmin | uh oh the progress bar hints that I'll wait a long time to get an up-to-date bzr.dev ... | 14:22 |
| mgedmin | unless it's not a progress bar but a simple spinner that looks like it's a progress bar stuck at <5% | 14:22 |
| fullermd | It'd certainly be quicker to grab a tarball of something (the 1.17rc maybe). | 14:22 |
| lifeless | fullermd: (where should I record 'FreeBSD doesn't have autoconf released in the last year-or-two') | 14:23 |
| fullermd | lifeless: The PR form is at <http://www.freebsd.org/send-pr.html>. | 14:25 |
| lifeless | fullermd: will it be better if you file it? | 14:26 |
| fullermd | Probably not. ade@ is the main person who handles autotools-related stuff, but I haven't seem him pipe up in a few months. | 14:26 |
| lifeless | http://lists.freebsd.org/pipermail/freebsd-ports/2009-May/054515.html | 14:27 |
| lifeless | oh wow... "Thank you for the problem report. You should receive confirmation of your report by electronic mail within a day." | 14:29 |
| === JamalFanaian is now known as JamalFanaian|afk | ||
| lifeless | fullermd: ok, http://www.freebsd.org/cgi/query-pr.cgi?pr=136867 | 14:35 |
| lifeless | fullermd: if you have anything to add that would be great | 14:35 |
| mgedmin | nice, launchpad somehow managed to create the bug twice, with different numbers, and they're already marked as duplicates | 14:40 |
| fullermd | It likes some bugs so much, it makes a backup. | 14:41 |
| amanica | lol | 14:42 |
| mgedmin | and yes, the bug is gone in bzr.dev | 14:48 |
| === JamalFanaian|afk is now known as JamalFanaian | ||
| === nevans1 is now known as nevans | ||
| === JamalFanaian is now known as JamalFanaian|afk | ||
| === mario__ is now known as pygi | ||
| === pgega is now known as CTO | ||
| === JamalFanaian|afk is now known as JamalFanaian | ||
| pygi | yay | 20:16 |
| pygi | roundup now kinda support bzr | 20:16 |
| pygi | :D | 20:16 |
| jelmer | pygi: \o/ | 20:16 |
| pygi | not tested, and probably doesn't work with my buggy code, but oh well :P | 20:16 |
| * hey bzr or cvs, that's the question | 20:18 | |
| pygi | lol | 20:19 |
| pygi | jelmer, when will we complete what we started at UDS? | 20:19 |
| jelmer | pygi: at some point :-P | 20:19 |
| pygi | aha, so we'll do it during next sprint? xD | 20:19 |
| * jelmer is at DebCamp at the moment, trying to get some Samba packages into the right shape | 20:19 | |
| ronny | sup | 20:21 |
| jelmer | hey ronny | 20:22 |
| ronny | jelmer: europython was a blast, but the 2 weeks since it have been very unproductive for me | 20:22 |
| Kobaz | ie: what i really want to know... say i have a million rows in a table with a view on it, with no WHERE conditions.... i select from the view, with a WHERE.... will it take forever, and do a select all, and then apply the where later... or does it do it all at once, and make use of the indexes, and all that | 21:14 |
| Kobaz | er | 21:14 |
| Kobaz | wrong window | 21:14 |
| pattern | i've been reading about how to use bazaar with launchpad and i have some questions.. | 22:06 |
| pattern | let's say i just created my own project on launchpad, then did "bzr init" on my own local machine, and added and committed some source to it... | 22:06 |
| pattern | then i "bzr launchpad-login me" and "bzr push lp:~me/myproject/mybranch" | 22:07 |
| pattern | then, when i make some changes on my local copy of the code and type "bzr commit", will those changes automatically be uploaded to my branch on launchpad? or will i have to do another push to get them there? | 22:07 |
| jpds | pattern: You always have to push. | 22:09 |
| pattern | i see | 22:10 |
| jpds | This way, you can commit multiple changes to a branch (for a completely new feature for example) and then push it all to a new branch for merging. | 22:11 |
| pattern | that makes sense | 22:12 |
| === JamalFanaian is now known as JamalFanaian|afk | ||
| pattern | now, on another subject.. let's say someone else has copied my branch from "lp:~me/myproject/mybranch" and made some changes, then pushed it to "lp:~him/hisproject/hisbranch", and notified me that he'd like to merge the changes in my project | 22:13 |
| pattern | how would i actually go about doing that? | 22:14 |
| jpds | bzr merge lp:~him/hisproject/hisbranch | 22:14 |
| pattern | that would merge with the code on my machine? | 22:14 |
| jpds | Yep. | 22:15 |
| pattern | i see | 22:15 |
| pattern | cool | 22:15 |
| jpds | And if there are any conflicts, bzr will tell you. | 22:15 |
| pattern | a nice and elegant way to do it | 22:15 |
| pattern | thanks for your help, jpds | 22:17 |
| jpds | pattern: No problem. | 22:18 |
| lifeless | pattern: you need to do a commit after the merge to record it | 22:39 |
| lifeless | jpds: I find the above is worth mentioning when people first encounter merge :) | 22:40 |
| jpds | lifeless: Ah, yes. :) | 22:40 |
| pattern | thank you | 22:44 |
| pattern | that's good to know | 22:44 |
| fullermd | lifeless: Funny... | 22:57 |
| fullermd | lifeless: http://lists.freebsd.org/pipermail/freebsd-ports/2009-July/055841.html | 22:57 |
| fullermd | So I guess lt2 is already in test. | 22:57 |
| lifeless | fullermd: oh cool | 23:02 |
| lifeless | fullermd: (care to test ? :P) | 23:02 |
| fullermd | Hey, just 'cuz I run the development head of my OS and window manager and version control system, doesn't mean I'll try ANY old bleeding edge :p | 23:03 |
| lifeless | :P | 23:04 |
| lifeless | I just want to know if libcpuinfo builds | 23:04 |
| lifeless | I could generate a make dist tarball for you | 23:04 |
| fullermd | Well, with those hacks to get along with lt 1.5, it does. | 23:04 |
| lifeless | ok cool | 23:04 |
| lifeless | that should be totally innocuous then | 23:04 |
| fullermd | Yah. I wouldn't be blown away by shock if the lt switch caused breakage, but I would be a little surprised. | 23:05 |
| lifeless | jam: if you're still here; .. a quick eyeball on https://code.edge.launchpad.net/~lifeless/bzr/bug-367632/+merge/8928 would be great | 23:07 |
| jfroy | The 1.17 branch's version is set to 1.18dev :/ | 23:12 |
| pattern | when i do a push from a branch on my machine to launchpad, will a record of every revision i've committed (and the associated log messages) go with it? | 23:14 |
| pattern | or does launchpad just get the delta between the last pushed revision and the newly pushed revision? | 23:15 |
| fullermd | pattern: Those revisions are what push pushes. | 23:17 |
| lifeless | pattern: bzr only sends new data | 23:17 |
| lifeless | pattern: but you end up with all the revisions on launchpad | 23:18 |
| pattern | i see | 23:19 |
| pattern | thanks again | 23:19 |
| === Pilky_ is now known as Pilky | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!