2012/12/27 Felipe Sateler <fsate...@debian.org>: > On Thu, Dec 27, 2012 at 7:03 AM, Dan S <danstowell+de...@gmail.com> wrote: >> 2012/12/26 Felipe Sateler <fsate...@debian.org>: >>> On Wed, Dec 26, 2012 at 4:21 PM, Dan S <danstowell+de...@gmail.com> wrote: >>>> 2012/12/26 Felipe Sateler <fsate...@debian.org>: >>>>> On Wed, Dec 26, 2012 at 3:09 PM, Dan S <danstowell+de...@gmail.com> wrote: >>>>>> 2012/12/26 Felipe Sateler <fsate...@debian.org>: >>>>>>> On Wed, Dec 26, 2012 at 7:19 AM, Dan S <danstowell+de...@gmail.com> >>>>>>> wrote: >>>>>>>> 2012/12/25 Felipe Sateler <fsate...@debian.org>: >>>>>>>>> On Thu, Dec 20, 2012 at 5:12 PM, >>>>>>>>> <danstowell-gu...@users.alioth.debian.org> wrote: >>>>>>>>>> >>>>>>>>>> The following commit has been merged in the master branch: >>>>>>>>>> commit b058aafc3bfcd2b94317654ff3306700f558c61b >>>>>>>>>> Author: Dan Stowell <danstow...@users.sourceforge.net> >>>>>>>>>> Date: Thu Dec 20 19:29:29 2012 +0000 >>>>>>>>>> >>>>>>>>>> Imported Upstream version 3.6.1~repack >>>>>>>>> >>>>>>>>> It seems this is not a merge from the upstream branch. >>>>>>>>> >>>>>>>>> This can be fixed, but the history would be rewritten and clones would >>>>>>>>> break. I think it is worth it, though. >>>>>> >>>>>> (Rewriting the history is fine by me btw) >>>>> >>>>> OK, you can do this as follows (I don't think I'll get access to my >>>>> usual computer this week): >>>>> >>>>> git rebase -i some-commit-before-the-bad-non-merge >>>>> # Select to edit the previous commit to the non-merge, and delete the >>>>> non-merge >>>>> # When git drops you in a shell to edit the command, do >>>>> git merge upstream/3.6.1_repack >>>>> git rebase --continue >>>>> >>>>> >>>>> This should leave you the correct history. >>>> >>>> Thanks, this works for me locally - but I am not allowed to push >>>> non-fast-forward to the remote server (as far as I know) >>> >>> You can use git push -f to remove the check >> >> OK, though it still refuses until I pull again, first. If I pull with >> rebase it goes back to the previous un-fixed state. If I pull without >> rebase I get this slightly odd state with parallel branches getting >> merged: >> http://paste.debian.net/219521/ >> If this is OK to push, please confirm and I will do. > > No, I think this history confuses even more.
I agree... > Strange that you cannot > do a git push -f. What happens if you try pushing only that branch? > (git push -f origin master:master) Oh no, I'm sorry, I ran this command without undoing the above pull :( in other words I just pushed the even-more-confusing version. Then I tried to fix it like this: git reset --hard ddc3f48 git push -f origin master:master and it rejected the non-fast-forward. Seems pretty certain that I cannot rewrite remote history; perhaps because I'm a -guest. Best Dan _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers