git has kicked me.  I have two machines and on neither can I push,  I
get
To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
 ! [rejected]        ParCS -> ParCS (non-fast-forward)
error: failed to push some refs to 'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

So the cauchyi opcide may or may not be checked it.  I cannot build on
account of the other problem, so I am stuck.  I have tried every
combination of push, pull, add and commit that I know, to no positive
effect.

How does one get out of this?  It seems to happen easily and is
irrecoverable.  I have read the 'Note about fast-forwards' section of
'git push --help' and it was totally without meaning to me.

==John ffitch

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

No, that does not get me ans=ywhere

xenakis:~/Sourceforge/csound/csound5 168> git pull ; git push
jpff@csound.git.sourceforge.net's password:
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
>From ssh://csound.git.sourceforge.net/gitroot/csound/csound5
   4f48d13..79fbe1b  ParCS      -> origin/ParCS
   f48b88f..aa1325a  master     -> origin/master
Updating f48b88f..aa1325a
Fast-forward
 SConstruct |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
jpff@csound.git.sourceforge.net's password:
To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
 ! [rejected]        ParCS -> ParCS (non-fast-forward)
error: failed to push some refs to
'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.
xenakis:~/Sourceforge/csound/csound5 169> >   got this



------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Your ParCS branch seems to have oddities. gitk --all should help see
differences between your repository and the one on sourceforge (yes,
it needs a gui, but it is clearer than on the command line).

On Thu, May 19, 2011 at 16:17,   wrote:
> No, that does not get me ans=ywhere
>
> xenakis:~/Sourceforge/csound/csound5 168> git pull ; git push
> jpff@csound.git.sourceforge.net's password:
> remote: Counting objects: 12, done.
> remote: Compressing objects: 100% (7/7), done.
> remote: Total 7 (delta 4), reused 0 (delta 0)
> Unpacking objects: 100% (7/7), done.
> >From ssh://csound.git.sourceforge.net/gitroot/csound/csound5
>   4f48d13..79fbe1b  ParCS      -> origin/ParCS
>   f48b88f..aa1325a  master     -> origin/master
> Updating f48b88f..aa1325a
> Fast-forward
>  SConstruct |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> jpff@csound.git.sourceforge.net's password:
> To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
>  ! [rejected]        ParCS -> ParCS (non-fast-forward)
> error: failed to push some refs to
> 'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> xenakis:~/Sourceforge/csound/csound5 169> >   got this
>
>
>
> ------------------------------------------------------------------------------
> What Every C/C++ and Fortran developer Should Know!
> Read this article and learn how Intel has extended the reach of its
> next-generation tools to help Windows* and Linux* C/C++ and Fortran
> developers boost performance applications - including clusters.
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://li

By the way, what does git status say?

On Thu, May 19, 2011 at 16:21, Felipe Sateler  wrote:
> Your ParCS branch seems to have oddities. gitk --all should help see
> differences between your repository and the one on sourceforge (yes,
> it needs a gui, but it is clearer than on the command line).
>
> On Thu, May 19, 2011 at 16:17,   wrote:
>> No, that does not get me ans=ywhere
>>
>> xenakis:~/Sourceforge/csound/csound5 168> git pull ; git push
>> jpff@csound.git.sourceforge.net's password:
>> remote: Counting objects: 12, done.
>> remote: Compressing objects: 100% (7/7), done.
>> remote: Total 7 (delta 4), reused 0 (delta 0)
>> Unpacking objects: 100% (7/7), done.
>> >From ssh://csound.git.sourceforge.net/gitroot/csound/csound5
>>   4f48d13..79fbe1b  ParCS      -> origin/ParCS
>>   f48b88f..aa1325a  master     -> origin/master
>> Updating f48b88f..aa1325a
>> Fast-forward
>>  SConstruct |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>> jpff@csound.git.sourceforge.net's password:
>> To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5
>>  ! [rejected]        ParCS -> ParCS (non-fast-forward)
>> error: failed to push some refs to
>> 'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/csound5'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes before pushing again.  See the 'Note about
>> fast-forwards' section of 'git push --help' for details.
>> xenakis:~/Sourceforge/csound/csound5 169> >   got this
>>
>>
>>
>> ------------------------------------------------------------------------------
>> What Every C/C++ and Fortran developer Should Know!
>> Read this article and learn how Intel has extended the reach of its
>> next-generation tools to help Windows* and Linux* C/C++ and Fortran
>> developers boost performance applications - including clusters.
>> http://p.sf.net/sfu/intel-dev2devmay
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>
>
>
> --
>
> Saludos,
> Felipe Sateler
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/list

I was not touching the ParCS branch.  That is in effect dead

==John ffitch

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

On 20 May 2011 08:21, john ffitch  wrote:
> I was not touching the ParCS branch.  That is in effect dead

If ParCS really is dead, throw away the locally divergent branch that
git is complaining about:

$ git branch -D ParCS

or, you could try to only push the master branch

$ git push origin master

>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> What Every C/C++ and Fortran developer Should Know!
> Read this article and learn how Intel has extended the reach of its
> next-generation tools to help Windows* and Linux* C/C++ and Fortran
> developers boost performance applications - including clusters.
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>

------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its 
next-generation tools to help Windows* and Linux* C/C++ and Fortran 
developers boost performance applications - including clusters. 
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net