| === Guest61548 is now known as mfisch | ||
| === mfisch is now known as Guest38607 | ||
| === Guest38607 is now known as mfisch | ||
| === Malsasa_ is now known as Malsasa | ||
| === Malsasa_ is now known as Malsasa | ||
| === _salem is now known as salem_ | ||
| === salem_ is now known as _salem | ||
| RPiAwesomeness | Can someone take a look at my patch here: https://code.launchpad.net/~aeves-nate/ubuntu/trusty/mydumper/fix-for-1402381/+merge/263835? | 20:52 |
|---|---|---|
| RPiAwesomeness | For whatever reason the diff is showing changes being made to 20 files even when I only removed 4 characters from one file. | 20:52 |
| RPiAwesomeness | And I am confused. | 20:53 |
| RPiAwesomeness | It's my first patch and I want to make sure I'm doing it right | 20:53 |
| tarpman | RPiAwesomeness: it looks like you based your patch on a newer version than trusty has; perhaps you started from 'bzr branch lp:ubuntu/mydumper' instead of 'bzr branch lp:ubuntu/trusty/mydumper'? | 20:55 |
| RPiAwesomeness | I did. Should I have started from trusty/mydumper? | 20:55 |
| tarpman | RPiAwesomeness: depends. is the bug already fixed in utopic and later? | 20:56 |
| TJ- | RPiAwesomeness: you need to fix the email address you've set, it is invalid (see debian/changelog) | 20:57 |
| RPiAwesomeness | tarpman: I can't tell from the LP bug report: https://bugs.launchpad.net/hundredpapercuts/+bug/1402381 | 20:58 |
| ubottu | Ubuntu bug 1402381 in mydumper (Ubuntu) "Duplicate option -k" [Medium,Confirmed] | 20:58 |
| RPiAwesomeness | It mentions vervet | 20:58 |
| RPiAwesomeness | At least as a tag | 20:58 |
| tarpman | RPiAwesomeness: the linked debian bug does not appear to be fixed yet; IMO the best way to solve this bug would be to post a patch to the debian bug, let it get synced from unstable into development, and then prepare stable update (SRU) patches | 20:58 |
| tarpman | er, from unstable into wily | 20:58 |
| RPiAwesomeness | tarpman: So, post the patch I made on the Debian bug tracker? | 20:59 |
| tarpman | maybe even directly upstream, if the upstream code is also affected | 21:00 |
| tarpman | point being, try to fix it as close to the source as possible in order to reach all affected users, rather than for example only ubuntu users | 21:01 |
| RPiAwesomeness | Okay. So, where would I access the upstream code? This is my first time doing anything patch-related :P | 21:01 |
| tarpman | the upstream project seems to be https://launchpad.net/mydumper | 21:01 |
| tarpman | (lp:mydumper) | 21:01 |
| tarpman | RPiAwesomeness: is https://bugs.launchpad.net/mydumper/+bug/1428608 the same as your bug? | 21:02 |
| ubottu | Ubuntu bug 1428608 in MySQL Data Dumper "missing -K option in mydumper manpage" [Low,Fix committed] | 21:02 |
| RPiAwesomeness | Nope, that's *adding* the -K option | 21:03 |
| RPiAwesomeness | Actually, -k and -K | 21:03 |
| RPiAwesomeness | Could be capitalization | 21:03 |
| RPiAwesomeness | Hmm... | 21:03 |
| RPiAwesomeness | Aha. Yup, it's been fixed upstream. | 21:04 |
| RPiAwesomeness | Shucks. And I thought I was being useful :( | 21:04 |
| RPiAwesomeness | One should be -K and the other -k, upper and lower case | 21:04 |
| tarpman | RPiAwesomeness: ok, fixed upstream already is good. so if you just wait, eventually the debian maintainer will update it in debian, and ubuntu will pick it up automatically | 21:10 |
| tarpman | RPiAwesomeness: if you want it in ubuntu sooner, you should propose a merge into the development release (wily), not a stable release | 21:10 |
| tarpman | hope that makes (some) sense | 21:11 |
| RPiAwesomeness | So, bzr branch lp:mydumper then bzr commit lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381 then bzr lp-propose? | 21:12 |
| RPiAwesomeness | bzr commit AFTER cd-ing into the mydumper directory of course | 21:13 |
| tarpman | bzr branch lp:ubuntu/mydumper | 21:13 |
| tarpman | as you're proposing the fix for ubuntu, not for upstream | 21:13 |
| RPiAwesomeness | Ah | 21:13 |
| RPiAwesomeness | k | 21:13 |
| RPiAwesomeness | Just to make sure I've got this, I run bzr branch lp:ubuntu/mydumper, make the patch, then commit to lp:~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381? | 21:15 |
| tarpman | sounds right. assuming "make the patch" means "add a new quilt patch in debian/patches" and not "patch the upstream source directly" (I have lost the tab with your previous merge in it...) | 21:17 |
| RPiAwesomeness | Yes, sorry. | 21:17 |
| tarpman | personally I usually skip this bzr stuff and just post debdiffs to bugs, so I might be missing some details | 21:18 |
| RPiAwesomeness | tarpman: Did I do it right? https://code.launchpad.net/~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381/+merge/263837 | 21:25 |
| RPiAwesomeness | Because I feel like I didn't :P | 21:25 |
| tarpman | RPiAwesomeness: per TJ-'s comment above, please fix your email address | 21:25 |
| RPiAwesomeness | Sorry, will do that. | 21:26 |
| tarpman | RPiAwesomeness: please don't include changes to .pc/ or to the upstream files | 21:27 |
| tarpman | RPiAwesomeness: and the new patch itself was not included, looks like | 21:27 |
| RPiAwesomeness | But the tutorial here: http://packaging.ubuntu.com/html/fixing-a-bug.html said to? | 21:27 |
| RPiAwesomeness | I'm so confused right now :P | 21:27 |
| RPiAwesomeness | Bother, this stuff is complicated | 21:28 |
| RPiAwesomeness | The patch wasn't included? Bah. | 21:28 |
| tarpman | oh, you're right. sorry, yes, that one does seem to be in bzr with patches applied. ok, ignore me on that one | 21:28 |
| tarpman | file under "tarpman doesn't do bzr merges, usually" :D | 21:28 |
| RPiAwesomeness | Phew :D | 21:28 |
| RPiAwesomeness | Okay, I think I'm starting to see how bzr works. I've only ever used git before, starting to see what's the comparable things | 21:31 |
| RPiAwesomeness | tarpman: But I did propose the merge to the correct lp repo? | 21:32 |
| tarpman | I think so. can't double-check since you deleted it again ;) | 21:33 |
| RPiAwesomeness | Yeah, going to re-propose it with the changelog changed | 21:33 |
| RPiAwesomeness | https://code.launchpad.net/~aeves-nate/ubuntu/wily/mydumper/fix-for-1402381/+merge/263839 | 21:35 |
| RPiAwesomeness | Should be correct now | 21:35 |
| * RPiAwesomeness crosses fingers | 21:35 | |
| RPiAwesomeness | tarpman & TJ-: Thanks for the help :) | 21:37 |
| tarpman | one more, sorry: you haven't closed your bug in the changelog | 21:38 |
| tarpman | that's easy, just add (LP: #1402381) at the end | 21:38 |
| ubottu | Launchpad bug 1402381 in mydumper (Ubuntu) "Duplicate option -k" [Medium,Confirmed] https://launchpad.net/bugs/1402381 | 21:38 |
| RPiAwesomeness | Ooooh | 21:38 |
| tarpman | iirc bzr also has some option that you should use to mark it as associated with that bug | 21:38 |
| tarpman | --fixes lp:1402381 or something like that | 21:38 |
| TJ- | correct | 21:38 |
| RPiAwesomeness | TJ-: If I bzr commit and already have proposal going, will that proposal automatically reflect my newest push? | 21:41 |
| RPiAwesomeness | bzr commit followed by bzr push to my launchpad that is | 21:41 |
| TJ- | RPiAwesomeness: I'm not sure... I seem to recall it may do when I last did that, but I may be imagining it | 21:42 |
| RPiAwesomeness | Okay. I think it does, just wanting to make sure. | 21:42 |
| TJ- | Because I think the merge proposal tracks the branch | 21:43 |
| RPiAwesomeness | That would make sense | 21:45 |
| RPiAwesomeness | Anyways, thanks for your help. I need to go do something else other than stare at a screen filled with debian, bzr, and patch stuffs for a bit. | 21:46 |
| RPiAwesomeness | O.O is mine eyes | 21:46 |
| TJ- | I know the feeling... git doesn't have that effect on me thankfully :) | 21:47 |
| === bduncan_ is now known as bduncan | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!