[07:47] <dholbach> good morning
[07:51] <Unit193> Howdy.
[10:02] <aeoril> Does anyone know why the diff for this merge proposal is so huge when I have only made minor changes to one file? https://code.launchpad.net/~aeoril/ubuntu/vivid/ubiquity/fix-for-1422113/+merge/250894
[10:09] <aeoril> I had previously accidentally submitted a merge proposal with the same branch name that included the files from debuild -S, but have subsequently deleted that off of launchpad, re-pulled a clean branch, applied my simple one-file code changes, then re-pushed it up.  However, that did not clean up the merge proposal diff.
[10:10] <aeoril> note that when I re-pulled the clean branch, I did so in a new directory on my computer
[10:12] <Laney> aeoril: presumably you want to propose it against lp:ubiquity and not lp:ubuntu/ubiquity
[10:13] <aeoril> Laney ok - I just found this:  https://bugs.launchpad.net/launchpad/+bug/483945
[10:13] <Laney> It's not a stale diff
[10:13] <aeoril> Laney why is it so big then?  Because I proposed it against the wrong thing?
[10:13] <Laney> You just asked it to diff against a different thing
[10:13] <aeoril> ok, thanks
[10:14] <Laney> np!
[10:20] <aeoril> Laney wow!  That worked great!  I submitted my first fix for merge!  Why did launchpad automatically fill in lp:ubuntu/ubiquity if it was wrong when I went to do the merge?
[10:21] <Laney> aeoril: because of the branch you pushed to
[10:21] <Laney> if you'd used lp:~/ubiquity/some_name it would have been right
[10:21] <aeoril> I thought so - I was following a tutorial that said to do that
[10:22] <aeoril> ok, now I know better Laney.  Thanks again!
[10:22] <Laney> You used the scheme for packaging branches but this is an upstream one
[10:22] <aeoril> Laney but upstream for Ubuntu, right?
[10:23] <Laney> Yes, the distinction is a bit blurry in ubiquity's case :)
[10:23] <aeoril> Laney ok, thanks!  I hope it is acceptable to the reviewer and works as it did for me in my tests!
[10:24] <Laney> They have a channel #ubuntu-installer FWIW
[10:24] <aeoril> oh, cool - I wish I had known that earlier!
[10:25] <aeoril> I have been very nervous about doing this right - since it is my first fix ...
[10:26] <aeoril> darkxst on #ubuntu-devel helped me do this whole thing, but he did not know what to do about the merge proposal problem
[10:26] <aeoril> Laney I am certainly glad I came to #ubuntu-motu, though!
[10:27] <Laney> heh
[10:27] <Laney> well, thanks for your fix!
[10:27] <aeoril> Laney I just hope it is all correct!  I did my best!
[10:27] <aeoril> Laney do you have time to look it over?  It is very simple ...
[10:28] <Laney> aeoril: Not me, but someone from the installer team should get to it v. soon
[10:28] <aeoril> Laney ok, cool - thanks again!
[10:29] <Laney> and if not, you know where to find them now
[10:29] <aeoril> yes, I do
[10:29] <aeoril> Laney it was an interesting "first fix" because I had to boot a LiveCD and then scp the .debs, install them, then manually run ubiquity to test
[10:30] <aeoril> (all in a vm)