In the manual the files misc/examples and misc/quickref.xml should not
be in the repository as they are made by program.  I cannot get rid of
them not get out of  lots of problems like

fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm ' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.

misc/examples.xml: needs merge

fatal: cannot do a partial commit during a merge.

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.


How do I get out of this fiasco?  Do I have to checkout a complete
tree again?  How do I prevent the problems with these two files?

I really am losing patience with git....

==John ffitch

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

> I think you can call git stash on your local copy to stash your changes
> before a commit, so you can do other stuff..
> like:
>

One can call stash but it does nothing!

xenakis:~/Sourceforge/csound/manual 153> git stash
Saved working directory and index state WIP on master: 9e45755 fighting git
HEAD is now at 9e45755 fighting git
xenakis:~/Sourceforge/csound/manual 154> git push
jpff@csound.git.sourceforge.net's password:
To ssh://jpff@csound.git.sourceforge.net/gitroot/csound/manual
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to
'ssh://jpff@csound.git.sourceforge.net/gitroot/csound/manual'
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/manual 155>




------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

My apologies... cat walked across the keyboard :-(

Hi John,

Could you try modifying the .gitignore file in the root of the manual
directory to exclude those files?  If there is not one already, you
can consult the .gitignore in csound5.

steven

On Wed, May 11, 2011 at 9:40 AM, John ff  wrote:
> In the manual the files misc/examples and misc/quickref.xml should not
> be in the repository as they are made by program.  I cannot get rid of
> them not get out of  lots of problems like
>
> fatal: 'commit' is not possible because you have unmerged files.
> Please, fix them up in the work tree, and then use 'git add/rm ' as
> appropriate to mark resolution and make a commit, or use 'git commit -a'.
>
> misc/examples.xml: needs merge
>
> fatal: cannot do a partial commit during a merge.
>
> 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.
>
>
> How do I get out of this fiasco?  Do I have to checkout a complete
> tree again?  How do I prevent the problems with these two files?
>
> I really am losing patience with git....
>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> Achieve unprecedented app performance and reliability
> What every C/C++ and Fortran developer should know.
> Learn how Intel has extended the reach of its next-generation tools
> to help boost performance applications - inlcuding 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
>

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

On 11 May 2011 14:40, John ff  wrote:
> How do I get out of this fiasco?  Do I have to checkout a complete
> tree again?  How do I prevent the problems with these two files?
>
> I really am losing patience with git....

Git is telling you what to do. You can, for example:

git rm misc/examples.xml
git commit

to untrack the generated file, I think.

Cheers
Gareth

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

> Hi John,
>
> Could you try modifying the .gitignore file in the root of the manual
> directory to exclude those files?  If there is not one already, you
> can consult the .gitignore in csound5.
>
>

Yep done that already



------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

> On 11 May 2011 14:40, John ff  wrote:
>> How do I get out of this fiasco?  Do I have to checkout a complete
>> tree again?  How do I prevent the problems with these two files?
>>
>> I really am losing patience with git....
>
> Git is telling you what to do. You can, for example:
>
> git rm misc/examples.xml
> git commit
>
> to untrack the generated file, I think.
>

I think not

xenakis:~/Sourceforge/csound/manual 155> git rm misc/examples.xml
fatal: pathspec 'misc/examples.xml' did not match any files
xenakis:~/Sourceforge/csound/manual 156> git commit
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 3 different commit(s) each, respectively.
#
# Untracked files:
#   (use "git add ..." to include in what will be committed)
#
#       .gitignore
#       categories.pyc
#       html/
#       xsl/customXHTMLchunk.xsl
nothing added to commit but untracked files present (use "git add" to track)
xenakis:~/Sourceforge/csound/manual 157> pit pull

CORRECT>pic pull (y|n|e|a)?
xenakis:~/Sourceforge/csound/manual 157> git pull
jpff@csound.git.sourceforge.net's password:
CONFLICT (delete/modify): misc/examples.xml deleted in HEAD and modified
in ebc26778b986ada3de39db1f44b103f57d4b44f0. Version
ebc26778b986ada3de39db1f44b103f57d4b44f0 of misc/examples.xml left in
tree.
Auto-merging misc/quickref.xml
Automatic merge failed; fix conflicts and then commit the result.

Sorry but I just do not know what it is talking about.  I have tried most
compinations of rm add commit pull and push, amd alos merrge and stash and
i have no idea what I am doing or what it is doing

==John ff


------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

On Wed, May 11, 2011 at 12:01,   wrote:
>> On 11 May 2011 14:40, John ff  wrote:
>>> How do I get out of this fiasco?  Do I have to checkout a complete
>>> tree again?  How do I prevent the problems with these two files?
>>>
>>> I really am losing patience with git....
>>
>> Git is telling you what to do. You can, for example:
>>
>> git rm misc/examples.xml
>> git commit
>>
>> to untrack the generated file, I think.
>>
>
> I think not
>
> xenakis:~/Sourceforge/csound/manual 155> git rm misc/examples.xml
> fatal: pathspec 'misc/examples.xml' did not match any files
> xenakis:~/Sourceforge/csound/manual 156> git commit
> # On branch master
> # Your branch and 'origin/master' have diverged,
> # and have 2 and 3 different commit(s) each, respectively.
> #
> # Untracked files:
> #   (use "git add ..." to include in what will be committed)
> #
> #       .gitignore
> #       categories.pyc
> #       html/
> #       xsl/customXHTMLchunk.xsl
> nothing added to commit but untracked files present (use "git add" to track)
> xenakis:~/Sourceforge/csound/manual 157> pit pull
>
> CORRECT>pic pull (y|n|e|a)?
> xenakis:~/Sourceforge/csound/manual 157> git pull
> jpff@csound.git.sourceforge.net's password:
> CONFLICT (delete/modify): misc/examples.xml deleted in HEAD and modified
> in ebc26778b986ada3de39db1f44b103f57d4b44f0. Version
> ebc26778b986ada3de39db1f44b103f57d4b44f0 of misc/examples.xml left in
> tree.
> Auto-merging misc/quickref.xml
> Automatic merge failed; fix conflicts and then commit the result.
>
> Sorry but I just do not know what it is talking about.  I have tried most
> compinations of rm add commit pull and push, amd alos merrge and stash and
> i have no idea what I am doing or what it is doing

The merge failed because somebody else modified examples.xml and you
tried to delete it, git does not know which commit takes precedent so
it refuses to continue the merge.

You need to fix the conflict (git status can help with that), and then
complete the merge with git commit.

-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
htt

>
> The merge failed because somebody else modified examples.xml and you
> tried to delete it, git does not know which commit takes precedent so
> it refuses to continue the merge.
>
> You need to fix the conflict (git status can help with that), and then
> complete the merge with git commit.
>
>

thank you; that worked.  All I need to understand is why that did not work
last time I tried that



------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net