[12:17] <BigWhale> Greetings
[12:19] <BigWhale> So, I had two branches: lp:kazam/stable and lp:kazam/unstable. It turns out that I pushed stable local copy into unstable branch. Now, the history of both branches is the same. It seems that I managed to overwrite everything. Can this be reversed somehow?
[12:49] <maxb> BigWhale: Unless you used push --overwrite, nothing is actually lost, you just end up looking at history from a different starting viewpoint
[12:50] <lfaraone> If one wants a private PPA but not everything else that comes with a commerical subscription, is there alternative pricing available beyond the normal $250 commercial sub?
[12:50] <BigWhale> maxb, yeah, I figured that things should still be there somewhere. :) I just have to revert them.
[12:51] <BigWhale> I had to ask just to be sure. :)
[12:51] <BigWhale> Thanks.
[12:51] <maxb> I've never heard of any alternative pricing structures be mentioned
[12:53] <maxb> BigWhale: Although you now have a slight issue that a LP automatic translations commit has landed in unstable on top of the pushed stable revisions
[12:54] <maxb> You could just choose to discard that, I guess, since I assume it would get re-exported at some point
[12:55] <BigWhale> yeah, that shouldn't be an issie
[12:55] <BigWhale> issue
[13:08] <BigWhale> maxb: I am failing to find a way on how to at least show what was done ...
[13:13] <maxb> There's no direct record of X changed to Y
[13:13] <maxb> I find the easiest thing to do is to use the 'bzr qlog' graphical log viewer to spot which revision should actually be the tip of the unstable branch
[13:18] <BigWhale> maxb, the problem is that it will show just those version from the branch I pushed. :)
[13:18] <maxb> no
[13:19] <maxb> Or yes, if you consider that the old tip revision of the unstable branch was actually contained within the history of the branch you pushed
[13:19] <maxb> However you use the terminology, the old tip revision of unstable is definitely within the set of revisions
[13:20] <BigWhale> well, I did merge from one branch to the other, back and forth, but those were just merges that were then pushed to the correct branch.
[13:28] <maxb> Perhaps I can simplify matters slightly...
[13:30] <maxb> So, I just looked in the history of the unstable branch, picked the appropriate revision, and pushed it to https://code.launchpad.net/~maxb/kazam/unstable
[13:31] <BigWhale> yeah that was the version I was looking for. :)
[13:31] <BigWhale> actually it was 398 .. so, now I just push this to unstable?
[13:32] <maxb> I can't see how it could have been 398
[13:33] <maxb> You can push --overwrite to unstable once you're happy you're pushing the right thing
[13:33] <BigWhale> oh.. it was 397 ...
[13:35] <maxb> The other thing you could do, instead of overwriting at all...
[13:35] <maxb> Is to merge the current lp:kazam/unstable into a branch at 397
[13:36] <maxb> Which you could then push back to lp:kazam/unstable, without overwrite, as a new r398, with the revision numbers you were previously accustomed to preceding it
[13:38] <BigWhale> Hmm, I'll think about it.
[13:38] <BigWhale> This option is the one I prefer. :)
[13:38] <BigWhale> I have to run now. Thanks for all the help!
[15:11] <shadeslayer> uhhh
[15:11] <shadeslayer> my upload was rejected
[15:12] <shadeslayer> pastebinning
[15:12] <shadeslayer> http://paste.ubuntu.com/5704982
[15:13] <shadeslayer> debuild -S -sd did say : dpkg-source: warning: diff `kde-baseapps-4.10.2/debian/patches/4.10.patch' patches file kde-baseapps-4.10.2/plasma/applets/folderview/iconview.cpp twice
[15:13] <shadeslayer> would that be the cause?
[15:39] <sujatro> i imported my ssh key to launchpad. after this how do i tell my ssh client to use this key???
[15:41] <sujatro> there isn't any ~/.ssh/config file in the location.
[16:57] <shadeslayer> wgrant: ping
[17:14] <shadeslayer> wgrant: I get this : http://paste.ubuntu.com/5704982 : when uploading a package, Riddell mentioned you probably know best why this happens
[17:54] <maxb> shadeslayer: Looks fairly clear cut that the rejection is because dpkg-source generated an error unpacking your source package - it ought to be replicable locally
[17:57] <shadeslayer> not really, I can get pbuilder to build the whole package
[17:57] <shadeslayer> otoh debuild -S -sd did say : dpkg-source: warning: diff `kde-baseapps-4.10.2/debian/patches/4.10.patch' patches file kde-baseapps-4.10.2/plasma/applets/folderview/iconview.cpp twice
[18:03] <maxb> I expect launchpad is operating in a treat-warnings-as-errors mode
[18:04] <maxb> Certainly one file being touched twice in a single patch is significantly anomalous
[18:05] <shadeslayer> hmm
[18:05] <shadeslayer> the patch I have is a combination of a series of patches
[18:05] <shadeslayer> so it touches the same file twice
[18:05] <maxb> You should either represent them as multiple files, or apply them in sequence and then regenerate a  composite patch
[18:05] <shadeslayer> could make it into 2 patches, but that's a load of work
[18:06] <shadeslayer> hmm
[18:06] <shadeslayer> okay