Merged master into upstream of libsdl2-image

Manuel A. Fernandez Montecelo manuel.montezelo at gmail.com
Sat Oct 19 14:30:32 UTC 2013


2013/10/19 Dominique Dumont <dod at debian.org>:
> On Saturday 19 October 2013 00:31:26 Manuel A. Fernandez Montecelo wrote:
>> 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?
>
> No need to.
>
> I did not have the repo on my disk so i cloned from remote.
>
> The merge from upstream into master did not break much: the upstream branch is
> now tied to master, but the actual history looks fine.
>
> The fix consists in putting upstream branch back on the latest upstream commit
> (tagged upstream/2.0.0+dfsg):
>
> - delete upstream branch locally: git branch -d upstream
> - delete remote branch: git push :upstream
> - recreate upstream branch from the right place:
>   git checkout -b upstream upstream/2.0.0+dfsg
> - check the result with gitk
> - push upstream: git push --all
>
> Then the remote repo should be back to normal.
>
> Feel free to get back to me in case of issue
>
> HTH

Thanks a lot!  I've done this, it seems that worked fine.  If somebody
finds any issue please let me know.


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



More information about the Pkg-sdl-maintainers mailing list