[FFmpeg-devel] [ANNOUNCE] ffmpeg-mt merged

[Anssi Hannula]

On 22.03.2011 21:09, Michael Niedermayer wrote:
> On Tue, Mar 22, 2011 at 07:51:25PM +0200, Anssi Hannula wrote:
>> On 22.03.2011 12:45, Michael Niedermayer wrote:
>>> On Tue, Mar 22, 2011 at 04:03:52AM -0600, Nathan Caldwell wrote:
>>>> On Tue, Mar 22, 2011 at 3:41 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
>>>>> On Tue, Mar 22, 2011 at 10:24:43AM +0100, Janne Grunau wrote:
>>>>>> On Mon, Mar 21, 2011 at 08:56:29PM +0100, Michael Niedermayer wrote:
>>>>>>>
>>>>>>> * merged ffmpeg-mt in
>>>>>>
>>>>>> thanks for ruining the history. see git log --reverse
>>>>>
>>>>> you talk to the wrong one here
>>>>> git log --reverse
>>>>> run in a new and unchanged ffmpeg-mt checkout looks identical
>>>>
>>>> $ git log --reverse --pretty="%h %ad (%an) <%ae> %s" videolan/master |
>>>> head -n 10
>>>> 77bb683 Wed Dec 20 00:02:47 2000 +0000 ((no author)) <(no
>>>> author)@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> New repository
>>>> initialized by cvs2svn.
>>>> 3eca5cb Wed Dec 20 00:02:47 2000 +0000 ((no author)) <(no
>>>> author)@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> New repository
>>>> initialized by cvs2svn.
>>>> 9aeeeb6 Wed Dec 20 00:02:47 2000 +0000 (Fabrice Bellard)
>>>> <fabrice at bellard.org> Initial revision
>>>> fa618c6 Wed Dec 20 00:02:47 2000 +0000 (glantau)
>>>> <glantau at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Initial revision
>>>> 3089828 Thu Jul 19 20:40:31 2001 +0000 (Fabrice Bellard)
>>>> <fabrice at bellard.org> test
>>>> 335174f Thu Jul 19 20:40:31 2001 +0000 (glantau)
>>>> <glantau at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> test
>>>> 1b58d58 Thu Jul 19 20:46:37 2001 +0000 (Fabrice Bellard)
>>>> <fabrice at bellard.org> removing old files
>>>> 4d1dc75 Thu Jul 19 20:46:37 2001 +0000 (glantau)
>>>> <glantau at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> removing old files
>>>> de6d9b6 Sun Jul 22 14:18:56 2001 +0000 (Fabrice Bellard)
>>>> <fabrice at bellard.org> Initial revision
>>>> 7432084 Sun Jul 22 14:18:56 2001 +0000 (glantau)
>>>> <glantau at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Initial revision
>>>
>>> and here is the output of this from ffmpeg-mt:
>>> Do you see a differnce? i do not
>>> This mess is in ffmpeg-mt, pulling from it pulls it in.
>>
>> I don't think mess should be pulled to the official repository.
>>
>> And I'm not sure how fixing the mess first would've broken ffmpeg-mt
>> checkouts, after all this is the official repository that is modified,
>> not the ffmpeg-mt one. If someone has a patchset/branch against
>> ffmpeg-mt and wants to switch it to mainline, the set can just be
>> rebased - that is a smaller issue than a messy mainline tree, IMHO.
> 
> If a majority of ffmpeg devels want us to undo this, i am not opposed
> if someone handles the technical side and also explains users how to
> fix their checkouts up
> but
> 1. it must be done within the next 24h or i will not allow it anymore
> 2. the user instructions to update their checkouts must be idiot proof
>    and simple
> 
> That said, as far as iam concerned its a minor issue for me to have
> this "trash" in the tree. And its more work for me to merge mt while
> keeping it out.
> 
> But as I said previously ffmpeg is a democratic project, ffmpeg
> developers who plan to contribute to ffmpeg in the future and thus
> are affected by how the main tree looks can vote

I then vote for undo, better than having the entire history duplicated.

(I'm not opposing merging ffmpeg-mt per se, I just don't want it to be a
direct git merge which messes the git history)

Recovery for users after an upstream rebase, if there are no local
commits to preserve:
$ git fetch origin
$ git reset --hard origin/master

(could be made shorter but I think the above is more "idiot proof")

If a developer already has some of their own commits on top of the
messed-up history, one can rebase it e.g. as follows:
$ git fetch origin
$ git rebase --onto origin/master cf740790677b

-- 
Anssi Hannula