[00:00] fullermd: not surprising [00:00] Well, it was over 5 gig when I killed it. That seems a LITTLE excessive. [00:07] Rebase seems awful difficult to figure out... [00:13] Ah, apparently that's 'cuz I want replay instead, which which 'help rewrite' doesn't even mention. [00:20] fullermd: yeah, replay is experimental (and hidden for that reason). don't use it. [00:21] Well, it's what I _need_. [00:21] And it seems to have worked. === thumper-afk is now known as thumper [01:12] 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:20] sorry, I know nothing about dbus... very little anyway [01:25] * KombuchaKip nods at thumper === 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 [11:44] Anyone active here at this ungodly hour? [11:54] you mean around noon? yeah. :) [12:13] An atheist might observe that every hour is ungodly, since there is no god... [12:29] But no moreso than any other hour === wedgwood_away is now known as wedgwood [15:25] hi, does anyone know why this is happening when importing a branch from github? http://launchpadlibrarian.net/132585831/django-core-django-master.log [15:29] hi pindonga [15:30] pindonga: bug 1084403 [15:30] bug 1084403 in bzr-git (Ubuntu) "no support for gpgsig tags" [High,Triaged] https://launchpad.net/bugs/1084403 [15:30] mgz beat me to it :) [15:30] fastest bug search in the west :) [15:31] jelmer: mgz thx! [15:31] any way to work around this until the bug is fixed? [15:32] pindonga: remove that tag from the repository, or create a clone of the repository with that tag removed and import that [15:32] pindonga: alternatively, use git-fastexport/bzr-fastimport [15:32] jelmer, ack, thx... will see what I do [16:58] Hello. [16:59] hey [16:59] With launchpad, what is the process for "forking" a project? [17:01] 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] Okay. [17:02] see https://help.launchpad.net/Code [17:10] Okay. I think I'm having trouble with launchpad ssh verification with the gui on windows. [17:10] I'm doing just fine with the cli though. [17:11] Nevermind. I believe I fixed it. [17:11] DarkLinkXXXX: are you using p... good good :) [17:13] Yeah. Just had to set a global variable. [17:22] What does it mean exactly that a branch has no working tree? [17:24] DarkLinkXXXX: read [17:24] Thanks. [17:24] I suppose I should skim the manual before asking simple questions. ^_^ [17:25] 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:41] Not sure if this bug or not, but pasting lp branch with a space causes problems without manual correction [17:42] don't do that then :) [17:42] True. [17:42] But the problem was confusing at first. [17:42] explorer (which I guess you're using?) could be nice and strip whitespace for you [17:43] Yeah. [17:43] 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:44] yeah, it would be reasonably easy for you to submit a fix for if you know some python [17:45] * DarkLinkXXXX knows some, fortunately. [17:47] 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:50] Of course, the hard part is always finding the code where such functionality is deermined. [17:57] DarkLinkXXXX: possibly lp:qbzr lib/branch.py though that only tackles the one dialogue [17:58] Hmm. [17:58] 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:59] then other places could use it too [17:59] I was looking in lp:bzr-explorer/1.1. Wrong place? [17:59] nope, it just uses qbzr quite heavily [17:59] Ah. Okay. [17:59] so, some dialogues are from there [17:59] you may also want some changes in lp:bzr-explorer [18:00] I already have my version of that. [18:00] 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:01] yeah, that's sensible [18:01] * DarkLinkXXXX prepares to read throught oodles of documentation, as he's never used pyqt. [18:02] it's mostly sensible and ignorable [18:02] and you shouldn't need to do anything complex with it [18:02] Yeah. [18:03] Is there a standard function to get text from textboxes? Someting I could search for? [18:03] 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:04] currentText() seems to be it, going by qbzr lib/branch.py l142 [18:04] Thanks. [18:05] strlen is a function right? [18:06] 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] Nevermind. I wanna try to figure this. [18:06] can i use the same checkout code from ubuntu using bzr? [18:06] SunilJoshi: generally you don't want to do that with a dvcs [18:07] having lots of branches is cheap, as is syncronising them [18:07] just have a location that both your windows and nix boxes have access to (eg, your launchpad account), [18:08] 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:09] mgz: ok [18:10] (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:12] mgz, Does this change seem sensible to you? [18:12] if from_location.endswith(" "): [18:12] from_location = from_location[:-1] [18:13] DarkLinkXXXX: I'd look at unicode.strip instead, remember you can just run python and do help() on things [18:13] True. === deryck is now known as deryck[lunch] [18:17] mgz, Seems to work in my experiments. Now how do I suggest the change? I'm used to a git workflow. [18:18] DarkLinkXXXX: I suggest you look at writing a test first [18:19] ? [18:19] 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:20] I don't understand. Doesn't that function already have a test? [18:20] DarkLinkXXXX: you're adding new functionality, though, so that implies a new test [18:20] particularly, what does your function do for inputs like "repo/branch name" as well as the case you care about [18:20] Oh. Okay. [18:21] don't worry, it's quite easy and I'll help :) [18:21] Okay. [18:21] But first, how do I create my own branch? [18:21] Do I need to create a new project for that? [18:22] what version of bzr are you using? [18:22] 2.5.1 [18:22] These are simple questions, I know. ^_^ [18:23] 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:25] That's simple enough. [18:25] there are ways and means of using git-style branches all in one place and switching between, but using seperate directories always works [18:33] Okay. [18:37] Here's the new branch with all it's glory. https://code.launchpad.net/~darklinkxxxx/qbzr/edit [18:37] So should I just suggest a merge via standard email? [18:37] Nevermind. I see a propose for merging option. === deryck[lunch] is now known as deryck === wedgwood is now known as wedgwood_away === wedgwood_away is now known as wedgwood