On Sat, Dec 21, 2019 at 9:30 PM Antonio Trande <anto.trande(a)gmail.com> wrote:
On 21/12/19 21:19, Fabio Valentini wrote:
> On Sat, Dec 21, 2019 at 9:11 PM Antonio Trande <anto.trande(a)gmail.com> wrote:
>>
>> Hi all.
>>
>> Please, can you help me to remove this last commit on EPEL7 branch?
>>
>>
https://src.fedoraproject.org/rpms/petsc4py/c/e47fbb3ef419b7be939108c2b1d...
>>
>> (I wish top return to the 3.11.0 release of petsc4py)
>
> git commits cannot be removed from dist-git.
> If you have not built this commit for EPEL7, then reverting the
> unwanted commits and pushing the result should do what you want?
> (I see that this is a merge commit, and I don't know how smart git is
> with reverting merge commits. You'll have to try to see it, I guess.)
>
> Fabio
>
Hi Fabio.
$ fedpkg switch-branch epel7
Branch 'epel7' set up to track remote branch 'epel7' from
'origin'.
<snip>
$ git reset --hard cf25d6d376fc95034decec02c2e1501f97ae4955
HEAD is now at cf25d6d Rebuild for PETSc-3.11.3
$ git commit -am "Undo latest commit"
On branch epel7
Your branch is behind 'origin/epel7' by 6 commits, and can be
fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
That's why I wrote "revert" and not "reset".
Which commit is the one you want to restore the epel7 branch to? cf25d6d?
Fabio
> $ ll
> total 36
> petsc4py-3.11.0-bug125.patch
> petsc4py-mpich_set_dir.patch
> petsc4py-openmpi_set_dir.patch
> petsc4py.spec
> 21.25 sources
>
> $ git push
> To
ssh://pkgs.fedoraproject.org/rpms/petsc4py
> ! [rejected] epel7 -> epel7 (non-fast-forward)
> error: failed to push some refs to
> 'ssh://sagitter@pkgs.fedoraproject.org/rpms/petsc4py'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Integrate the remote changes (e.g.
> hint: 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for
details.
>
>
> --
> ---
> Antonio Trande
> Fedora Project
> mailto 'sagitter at fedoraproject dot org'
> GPG key: 0x7B30EE04E576AA84
> GPG key server:
https://keys.openpgp.org/
>