| lifeless | fullermd: not surprising | 00:00 |
|---|---|---|
| fullermd | Well, it was over 5 gig when I killed it. That seems a LITTLE excessive. | 00:00 |
| fullermd | Rebase seems awful difficult to figure out... | 00:07 |
| fullermd | Ah, apparently that's 'cuz I want replay instead, which which 'help rewrite' doesn't even mention. | 00:13 |
| jelmer | fullermd: yeah, replay is experimental (and hidden for that reason). don't use it. | 00:20 |
| fullermd | Well, it's what I _need_. | 00:21 |
| fullermd | And it seems to have worked. | 00:21 |
| === thumper-afk is now known as thumper | ||
| KombuchaKip | Would anyone perchance be able to help me with a d-bus issue? I know it's off topic, but since there are Bzr developers in hear familiar with d-bus, I thought I would give it a shot having nearly given up on the XDG mailing list. | 01:12 |
| thumper | sorry, I know nothing about dbus... very little anyway | 01:20 |
| * KombuchaKip nods at thumper | 01:25 | |
| === mmrazik is now known as mmrazik|afk | ||
| === mmrazik|afk is now known as mmrazik | ||
| === mmrazik is now known as mmrazik|otp | ||
| === mmrazik|otp is now known as mmrazik | ||
| DarkLinkXXXX | Anyone active here at this ungodly hour? | 11:44 |
| mgz | you mean around noon? yeah. :) | 11:54 |
| lifeless | An atheist might observe that every hour is ungodly, since there is no god... | 12:13 |
| LeoNerd | But no moreso than any other hour | 12:29 |
| === wedgwood_away is now known as wedgwood | ||
| pindonga | hi, does anyone know why this is happening when importing a branch from github? http://launchpadlibrarian.net/132585831/django-core-django-master.log | 15:25 |
| jelmer | hi pindonga | 15:29 |
| mgz | pindonga: bug 1084403 | 15:30 |
| ubot5 | bug 1084403 in bzr-git (Ubuntu) "no support for gpgsig tags" [High,Triaged] https://launchpad.net/bugs/1084403 | 15:30 |
| jelmer | mgz beat me to it :) | 15:30 |
| mgz | fastest bug search in the west :) | 15:30 |
| pindonga | jelmer: mgz thx! | 15:31 |
| pindonga | any way to work around this until the bug is fixed? | 15:31 |
| jelmer | pindonga: remove that tag from the repository, or create a clone of the repository with that tag removed and import that | 15:32 |
| jelmer | pindonga: alternatively, use git-fastexport/bzr-fastimport | 15:32 |
| pindonga | jelmer, ack, thx... will see what I do | 15:32 |
| DarkLinkXXXX | Hello. | 16:58 |
| mgz | hey | 16:59 |
| DarkLinkXXXX | With launchpad, what is the process for "forking" a project? | 16:59 |
| mgz | there isn't anything you need to do on the website, you get a branch you're interested in, then push your changes back up under a new location | 17:01 |
| DarkLinkXXXX | Okay. | 17:01 |
| mgz | see https://help.launchpad.net/Code | 17:02 |
| DarkLinkXXXX | Okay. I think I'm having trouble with launchpad ssh verification with the gui on windows. | 17:10 |
| DarkLinkXXXX | I'm doing just fine with the cli though. | 17:10 |
| DarkLinkXXXX | Nevermind. I believe I fixed it. | 17:11 |
| mgz | DarkLinkXXXX: are you using p... good good :) | 17:11 |
| DarkLinkXXXX | Yeah. Just had to set a global variable. | 17:13 |
| DarkLinkXXXX | What does it mean exactly that a branch has no working tree? | 17:22 |
| mgz | DarkLinkXXXX: read <http://doc.bazaar.canonical.com/beta/en/user-guide/core_concepts.html> | 17:24 |
| DarkLinkXXXX | Thanks. | 17:24 |
| DarkLinkXXXX | I suppose I should skim the manual before asking simple questions. ^_^ | 17:24 |
| mgz | genenerally it means you're trying to do something that requires the files to work (like a merge), on a remote branch that won't have them (push doesn't create files on disk, just the vcs bits) | 17:25 |
| DarkLinkXXXX | Not sure if this bug or not, but pasting lp branch with a space causes problems without manual correction | 17:41 |
| mgz | don't do that then :) | 17:42 |
| DarkLinkXXXX | True. | 17:42 |
| DarkLinkXXXX | But the problem was confusing at first. | 17:42 |
| mgz | explorer (which I guess you're using?) could be nice and strip whitespace for you | 17:42 |
| DarkLinkXXXX | Yeah. | 17:43 |
| DarkLinkXXXX | I'm just saying that'd be nice. | 17:43 |
| * DarkLinkXXXX may try to see if he can implement that himself, if he knows the language | 17:43 | |
| mgz | yeah, it would be reasonably easy for you to submit a fix for if you know some python | 17:44 |
| * DarkLinkXXXX knows some, fortunately. | 17:45 | |
| DarkLinkXXXX | So I guess first I'll see the branch for the version I'm using, then check out the latest branch to see if this was alerady implemented. | 17:47 |
| DarkLinkXXXX | Of course, the hard part is always finding the code where such functionality is deermined. | 17:50 |
| mgz | DarkLinkXXXX: possibly lp:qbzr lib/branch.py though that only tackles the one dialogue | 17:57 |
| DarkLinkXXXX | Hmm. | 17:58 |
| mgz | you'd probably want a fancy get_location helper that would take a text widget and pull out a sane path or url from it | 17:58 |
| mgz | then other places could use it too | 17:59 |
| DarkLinkXXXX | I was looking in lp:bzr-explorer/1.1. Wrong place? | 17:59 |
| mgz | nope, it just uses qbzr quite heavily | 17:59 |
| DarkLinkXXXX | Ah. Okay. | 17:59 |
| mgz | so, some dialogues are from there | 17:59 |
| mgz | you may also want some changes in lp:bzr-explorer | 17:59 |
| DarkLinkXXXX | I already have my version of that. | 18:00 |
| DarkLinkXXXX | I thought I'd compare my version and the latest versioin to see if anything has happned along the lines of what I wanted. | 18:00 |
| mgz | yeah, that's sensible | 18:01 |
| * DarkLinkXXXX prepares to read throught oodles of documentation, as he's never used pyqt. | 18:01 | |
| mgz | it's mostly sensible and ignorable | 18:02 |
| mgz | and you shouldn't need to do anything complex with it | 18:02 |
| DarkLinkXXXX | Yeah. | 18:02 |
| DarkLinkXXXX | Is there a standard function to get text from textboxes? Someting I could search for? | 18:03 |
| mgz | the one gotcha I'll mention now is you get a unicode-like object back as the string from qt widgets, but cast to unicode() works fine | 18:03 |
| mgz | currentText() seems to be it, going by qbzr lib/branch.py l142 | 18:04 |
| DarkLinkXXXX | Thanks. | 18:04 |
| DarkLinkXXXX | strlen is a function right? | 18:05 |
| SunilJoshi | Hi, i was using bzr with windows 7 and checkout some code, now i hv installed ubuntu (i.e. Dual boot) and i use the same checkout code from ubuntu using bzr | 18:06 |
| DarkLinkXXXX | Nevermind. I wanna try to figure this. | 18:06 |
| SunilJoshi | can i use the same checkout code from ubuntu using bzr? | 18:06 |
| mgz | SunilJoshi: generally you don't want to do that with a dvcs | 18:06 |
| mgz | having lots of branches is cheap, as is syncronising them | 18:07 |
| mgz | just have a location that both your windows and nix boxes have access to (eg, your launchpad account), | 18:07 |
| mgz | and get in the habit of committing and pushing when you've finished doing a change, and pulling before starting a new one (and using feature branches) | 18:08 |
| SunilJoshi | mgz: ok | 18:09 |
| mgz | (you can access your ntfs partition from under ubuntu, but you probably don't want to be writing to it with bzr from nix) | 18:10 |
| DarkLinkXXXX | mgz, Does this change seem sensible to you? | 18:12 |
| DarkLinkXXXX | if from_location.endswith(" "): | 18:12 |
| DarkLinkXXXX | from_location = from_location[:-1] | 18:12 |
| mgz | DarkLinkXXXX: I'd look at unicode.strip instead, remember you can just run python and do help() on things | 18:13 |
| DarkLinkXXXX | True. | 18:13 |
| === deryck is now known as deryck[lunch] | ||
| DarkLinkXXXX | mgz, Seems to work in my experiments. Now how do I suggest the change? I'm used to a git workflow. | 18:17 |
| mgz | DarkLinkXXXX: I suggest you look at writing a test first | 18:18 |
| DarkLinkXXXX | ? | 18:19 |
| mgz | probably the easiest way of doing that is putting the helper in qbzr lib/util.py then writing unit tests for thaat function in lib/tests/test_util.py | 18:19 |
| DarkLinkXXXX | I don't understand. Doesn't that function already have a test? | 18:20 |
| spiv | DarkLinkXXXX: you're adding new functionality, though, so that implies a new test | 18:20 |
| mgz | particularly, what does your function do for inputs like "repo/branch name" as well as the case you care about | 18:20 |
| DarkLinkXXXX | Oh. Okay. | 18:20 |
| mgz | don't worry, it's quite easy and I'll help :) | 18:21 |
| DarkLinkXXXX | Okay. | 18:21 |
| DarkLinkXXXX | But first, how do I create my own branch? | 18:21 |
| DarkLinkXXXX | Do I need to create a new project for that? | 18:21 |
| mgz | what version of bzr are you using? | 18:22 |
| DarkLinkXXXX | 2.5.1 | 18:22 |
| DarkLinkXXXX | These are simple questions, I know. ^_^ | 18:22 |
| mgz | okay, just go up one level, then do `bzr branch trunk strip_location` where trunk is whatever you've got the existing branch named and strip_location is whatever you want to call this feature branch | 18:23 |
| DarkLinkXXXX | That's simple enough. | 18:25 |
| mgz | there are ways and means of using git-style branches all in one place and switching between, but using seperate directories always works | 18:25 |
| DarkLinkXXXX | Okay. | 18:33 |
| DarkLinkXXXX | Here's the new branch with all it's glory. https://code.launchpad.net/~darklinkxxxx/qbzr/edit | 18:37 |
| DarkLinkXXXX | So should I just suggest a merge via standard email? | 18:37 |
| DarkLinkXXXX | Nevermind. I see a propose for merging option. | 18:37 |
| === deryck[lunch] is now known as deryck | ||
| === wedgwood is now known as wedgwood_away | ||
| === wedgwood_away is now known as wedgwood | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!