[petsc-dev] [petsc-maint] Who fucked up the repository?

[Matthew Knepley]

On Sat, Jun 15, 2013 at 10:36 PM, Karl Rupp <rupp at mcs.anl.gov> wrote:

> Hi Matt,
>
> did you issue
>
> $ git config --global push.default simple
>

Yes, I believe so, but I just did it again.


> as described here:
>  https://bitbucket.org/petsc/**petsc/wiki/developer-**instructions-git<https://bitbucket.org/petsc/petsc/wiki/developer-instructions-git>
> ? It looks like you did not update your working copy of 3.4.1, but try to
> push your local version (the git default). The 'simple' strategy would turn
> this off so that you only push knepley/pylith
>

1) I ran the push again, even after issuing the command above, and still
got the same error

2) How do I update my copy of 3.4.1? I pulled every branch and did a fetch.

   Matt


> Best regards,
> Karli
>
>
>
> On 06/15/2013 03:23 PM, Matthew Knepley wrote:
>
>> I get this every time I try to push a branch:
>>
>> git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags
>> origin knepley/pylith:knepley/pylith
>>
>> Pushing to git at bitbucket.org:petsc/petsc
>>
>> To git at bitbucket.org:petsc/petsc
>>
>>   = [up to date]      v2.0.29 -> v2.0.29
>>
>>   = [up to date]      v2.1.0 -> v2.1.0
>>
>>   = [up to date]      v2.3.2 -> v2.3.2
>>
>>   = [up to date]      v2.3.3 -> v2.3.3
>>
>>   = [up to date]      v3.0.0 -> v3.0.0
>>
>>   = [up to date]      v3.1 -> v3.1
>>
>>   = [up to date]      v3.2 -> v3.2
>>
>>   = [up to date]      v3.3 -> v3.3
>>
>>   = [up to date]      v3.4 -> v3.4
>>
>>     3d2e007..e4fc00d  knepley/pylith -> knepley/pylith
>>
>>   ! [rejected]        v3.4.1 -> v3.4.1 (non-fast-forward)
>>
>> updating local tracking ref 'refs/remotes/origin/knepley/**pylith'
>>
>> error: failed to push some refs to 'git at bitbucket.org:petsc/**petsc'
>>
>> hint: Updates were rejected because a pushed branch tip is behind its
>> remote
>>
>> hint: counterpart. Check out this branch and merge the remote changes
>>
>> hint: (e.g. 'git pull') before pushing again.
>>
>> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>>
>> Completed with errors, see above
>>
>>
>> If I remove --tags, then it works.
>>
>>
>>     Matt
>>
>>
>> --
>> What most experimenters take for granted before they begin their
>> experiments is infinitely more interesting than any results to which
>> their experiments lead.
>> -- Norbert Wiener
>>
>
>


-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130615/2e710031/attachment.html>