WTF are you doing?

[bas-t]

I never sent you any pull requests. nevertheless you make it look like I do. I resent that!

If you really don't know git at all, just save your changes so you can use them later as a patch, and delete your fork.

[bas-t]

Ok< I hope this gets your attention, there is no other way to contact you, sadly. Please respond

[Zlo]

I make it look like you did something? What are you smoking ?

[bas-t]

When you merge a pull request, it is understood (imo) that there is in fact a pull request. From me to you that is. Get it?

[Zlo]

I see at the top of this page "bas-t wants to merge 6 commits into bas-t:stable from Zlo:stable". You mean to tell me that I can produce that ? If so that seems to me like a bug in github.

About not being able to contact me, I do not know what you tried, but if the language used in those messages resembled the one that I did see, I'm sure either github or my spam filter blocked them.

A said, I probably made a mistake, for which my apologies.

The reason I have that fork up here is because I felt it may be useful for other people running Ubuntu, something you explicitly do not support (which is your good right). If you think it has no right to exist, feel free to complain to github, good luck.

Rest assured that I do, nor will do anything here targeted at you in any way, nor positive nor negative.

[bas-t]

Apologies accepted. To avoid this github bug, you may want to do this:

git remote add upstream https://github.com/bas-t/ffdecsawrapper.git

So now, whenever you want to merge/cherry-pick commits from my repo, just do:

git fetch upstream

Now you can merge like: "git merge upstream/stable", or cherry-pick a single commit.

About Ubuntu: it's not so much that I don't want to support it, it's just that I don't have an Ubuntu backend running on a regular basis, that makes it hard to test any Ubuntu specific changes. Howsever, this particular case, in which those Canonical freaks managed to screw up once again, triggered me to do some work on the kernelpatch file. I preferr a method that works for Debian as well as Ubuntu, so I did not merge your work. Please let me know if this works for you.

Another thing: You merged a commit from the old sasc-ng branch: e53e2dc639 In what way do you benefit from this?

[Zlo]

On Mon, Apr 28, 2014 at 08:45:59AM -0700, bas-t wrote:

Apologies accepted. To avoid this github bug, you may want to do this:

git remote add upstream https://github.com/bas-t/ffdecsawrapper.git

So now, whenever you want to merge/cherry-pick commits from my repo, just do:

git fetch upstream

Now you can merge like: "git merge upstream/stable", or cherry-pick a single commit.

Yeah, it's not lack of knowledge, it's our local policy on our gitlab setup (where this does not lead to this confusion) accidentally applied to github.

About Ubuntu: it's not so much that I don't want to support it, it's just that I don't have an Ubuntu backend running on a regular basis, that makes it hard to test any Ubuntu specific changes. Howsever, this particular case, in which those Canonical freaks managed to screw up once again, triggered me to do some work on the kernelpatch file. I preferr a method that works for Debian as well as Ubuntu, so I did not merge your work. Please let me know if this works for you.

I noticed that I had that notion from my old checkout with the notice in the README:

NOTICE: I'm done with Ubuntu. All Ubuntu stuff has been saved to a new branch: ubuntu. I'm stripping all Ubuntu stuff from stable branch. I'm not testing FFdecsawrapper on Ubuntu anymore.**

I see that that's gone now. ;)

Yes, your change to apt-get source does work. That's clearly more clean than my dget construction.

Another thing: You merged a commit from the old sasc-ng branch: e53e2dc639 In what way do you benefit from this?

Simply because I wanted to have a drop-in replacement for sasc-ng and did not want to change behaviour.

Marc