> Please report the issues you are facing to the list! I still don't
> understand the issues you are facing, and I'm quite optimistic that we
> can sort them out. I sure would be glad to help if I can.

I have two main scripts, both using expect
PULC is just git pull with a password
PUTC         git push

Typical behaviour is I commit and either push or pull-push.
About half the times I pull it complains and dumps me in vi which
destroys the script.  I then have to do a git pull at the commandline,
which saves there is some MERGE_xxx so it asks what to do.  I usually
edit and complain.  This can happen with the file(s) I have changed are
disjoint from the ones that are changed on SF, and I cannot see why.

Sorry I have not captured the actual messages but it really interferes
with my plans.

I should say I never had this much trouble with CVS.  Some problems
with SVN and occasional problems with BZR (which I only use for
emacs).

I find having to type a long "random" password a real pain.

==John ffitch

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Merging from a remote branch before pushing is a common and normal
behavior for GIT. You're merging in the changes from head into your
local repository. Some notes:

1. You can skip using expect scripts and use an ssh key so that you
don't have to require entering credentials.[1]

2. Try using "git pull --no-edit". There's more information about this
at [2]. That should auto-commit with the default merge message.

3. Since your an emacs guy, you can change what editor git uses for
commits using:

git config --global core.editor "emacs"

or something like:

git config --global core.editor "/usr/bin/emacs"

This can be updated by hand too in ~/.gitconfig. Mine has a section
that looks like:

[core]
  excludesfile = /Users/stevenyi/.gitignore_global
  editor = /usr/bin/vim

Hope that helps!
steven

[1] - https://sourceforge.net/apps/trac/sourceforge/wiki/SSH%20keys
[2] - https://groups.google.com/forum/#!topic/git-users/AE4cuQKqL54

On Thu, Aug 8, 2013 at 11:01 AM, john ffitch  wrote:
>> Please report the issues you are facing to the list! I still don't
>> understand the issues you are facing, and I'm quite optimistic that we
>> can sort them out. I sure would be glad to help if I can.
>
> I have two main scripts, both using expect
> PULC is just git pull with a password
> PUTC         git push
>
> Typical behaviour is I commit and either push or pull-push.
> About half the times I pull it complains and dumps me in vi which
> destroys the script.  I then have to do a git pull at the commandline,
> which saves there is some MERGE_xxx so it asks what to do.  I usually
> edit and complain.  This can happen with the file(s) I have changed are
> disjoint from the ones that are changed on SF, and I cannot see why.
>
> Sorry I have not captured the actual messages but it really interferes
> with my plans.
>
> I should say I never had this much trouble with CVS.  Some problems
> with SVN and occasional problems with BZR (which I only use for
> emacs).
>
> I find having to type a long "random" password a real pain.
>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> Get 100% visibility into Java/.NET code with AppDynamics Lite!
> It's a free troubleshooting tool designed for production.
> Get down to code-level detail for bottlenecks, with <2% overhead.
> Download for free and get started troubleshooting in minutes.
> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net