Re: Incorrect push to edk2-platforms

["Sami Mujawar" <sami.mujawar@arm.com>]

Hi Mike,

I have tried to revert the commit on my local branch as follows

git revert 2faefb2bbcc8083e1bd28908c0b29b5d18595298 -m 1

With this change the preceding commit is dropped.

     git whatchanged -1
     commit 54f3232f3e19387e3bc5eb79c4b46eb2daba99fd (HEAD -> test)
     Author: Sami Mujawar <sami.mujawar@arm.com>
     Date:   Fri Jul 29 21:39:45 2022 +0100

         Revert "Merge branch 'master' of
github.com:/tianocore/edk2-platforms"

         This reverts commit 2faefb2bbcc8083e1bd28908c0b29b5d18595298,
reversing
         changes made to cfe3c3653c88ca85155d6fb8a6ffd449c38f8e9b.

     :100644 100644 c26199147a87 96efb2d38e2b M
Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
     :100644 000000 89c9dbd9983d 000000000000 D
Silicon/Socionext/SynQuacer/AcpiTables/Dbg2.aslc


This means I would need to re-apply the commit
86759a1bf82904fec4ce5abe3bb7c04948822767 <Masami Hir..>
Silicon/SynQuacer: add DBG2 ACPI table

Can you advise what I should be doing here, please?

Also, please let me know if I should be reverting all the commits in
reverse order till the 'Merge' commit and then reapply all the changes.

Regards,

Sami Mujawar

On 29/07/2022 09:20 pm, Kinney, Michael D wrote:
> Hi Sami,
>
> There is one other instance of this in edk2-platform history.
>
> It was immediately followed by a Revert.
>
> --------------
> commit 3e31cfea3de2fe49b49a67a1d6c9f9ca09e7f332
> Author: Siyuan Fu <siyuan.fu@intel.com>
> Date:   Mon Feb 10 12:29:48 2020 +0800
>
>      Revert "Merge remote-tracking branch 'upstream/master'"
>
>      This reverts commit afb07dacda55f4f378fabf2e55172a95d01e5df4, reversing
>      changes made to 3f0d14bb1358dfadef65dbd22c8f6d3b89471d49.
>
> commit afb07dacda55f4f378fabf2e55172a95d01e5df4
> Merge: 0c86cf06ed 3f0d14bb13
> Author: Siyuan Fu <siyuan.fu@intel.com>
> Date:   Mon Feb 10 11:49:14 2020 +0800
>
>      Merge remote-tracking branch 'upstream/master'
> --------------
>
> Reverting the merge commit and adding the changes correctly
> may be the cleanest way to address.
>
> Best regards,
>
> Mike
>
>> -----Original Message-----
>> From: Sami Mujawar <sami.mujawar@arm.com>
>> Sent: Friday, July 29, 2022 1:14 PM
>> To: Ard Biesheuvel <ardb+tianocore@kernel.org>; edk2-devel-groups-io <devel@edk2.groups.io>; nd@arm.com; Leif Lindholm
>> <quic_llindhol@quicinc.com>; Kinney, Michael D <michael.d.kinney@intel.com>
>> Subject: Re: Incorrect push to edk2-platforms
>>
>> Adding Leif and Mike.
>>
>> On 29/07/2022 08:54 pm, Sami Mujawar wrote:
>>> Hi Ard,
>>>
>>> I have accidentally pushed a change to the edk2-platforms repo.
>>>
>>> The commit is
>>>
>>> 2faefb2bbcc8083e1bd28908c0b29b5d18595298 <Sami Mujawar> Merge branch
>>> 'master' of github.com:/tianocore/edk2-platforms
>>>
>>> Appologies for the trouble. Can you advise on how this can be fixed,
>>> please?
>>>
>>> Regards,
>>>
>>> Sami Mujawar
>>>
>>>
>>>
>> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not
>> the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for
>> any purpose, or store or copy the information in any medium. Thank you.
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.