Re: Access to CVS

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

Aaron Schrab wrote:
> The `--ff-only` option is only somewhat useful here.  It merely causes 
> the merge to be aborted if it can't be done without creating a merge 
> commit, in which case some other method of bringing in those changes 
> would need to be tried.

I was trying to keep it reasonably brief. Feel free to suggest
alternative wording.

Aaron Schrab wrote:
> At 07:37 -0800 13 Dec 2012, Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> >Is there any way to actually enforce this?
> 
> If the main git repository were fully under our control, yes, a hook 
> could be setup there to reject pushes which introduce merge commits.  

For sourceforge, we can get at the repository using the shell access.
The documentation mentions commit email hooks so others are probably
possible. That said, I'm not sure it would be wise because it would also
block merges from public feature branches.

Peter Stephenson wrote:
> It might be useful to give a sample list of explicit git commands to use
> at each stage, in particular what you'd do for an initial commit, for
> updating the commit with the mailing list ID, for any kind of trickery
> to reduce the number of commits that get pushed, and for pushing it back
> (as this is for those new to git you can assume the relationship between
> the local archive and the remote master is simple and let the git gurus
> do the clever stuff).

Is that a suggestion for the contents of Etc/zsh-development-guide or
just a case that it'd be useful. I'm assuming the latter - it's not like
we have an introduction to CVS, autoconf, C etc in the file. Anyway, in
that case it seems Phil and Frank have already answered this.

Oliver