Merged master into upstream of libsdl2-image

[Manuel A. Fernandez Montecelo]

2013/10/18 Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>:
> Hi,
>
> I think that I messed up (or somebody did previously, unlikely) and
> merged master into upstream for libsdl2-image.
>
> So first, this is a warning so you perhaps should not pull from this
> repository until this is fixed; and second to ask for help about how
> to fix this.
>
> Is there an easy and clean way to do this, without affecting people
> who already pulled from this repository?
>
> Cheers and sorry.
> --
> Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>


Locally, I resetted to the first commit:

  git reset --hard upstream/2.0.0_rc1

and them pulled each upstream commit sequentially, requesting ff-only
(so to not create a merge commit, because I think that otherwise
people who already checked this out will see conflicts):

  git pull --ff-only origin upstream/2.0.0_rc1+dfsg
  git pull --ff-only origin upstream/2.0.0+dfsg

Now this is the log (branch upstream):

commit 86b6b9ab10d088509b4f59daeeac57a6fe06ca33
Author: Felix Geyer <fgeyer at debian.org>
Date:   Tue Aug 13 12:30:18 2013 +0200

    Imported Upstream version 2.0.0+dfsg

commit 401a92d06c2527645b59ef77639a7a2dcf6aacf8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Jul 12 17:37:31 2013 +0200

    Imported Upstream version 2.0.0~rc1+dfsg

commit ac253275c09f9f63eafc9c154f24eac800c56034
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Jun 1 18:05:21 2013 +0200

    Imported Upstream version 2.0.0~rc1


The thing is that probably this will create
conflicts/warnings/problems for people who already checked out,
because it doesn't preserve Felix's signatures (I guess that it works
as intended).

If I do not do a ff-only pull, signatures seem to be preserved, but I
don't know if the whole repository will.

Perhaps it would be better if one of you who has the directory checked
out, before pulling my changes, reset the origin repository to your
local state?


Cheers.
-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>