Re: FVWM: pull requests

[Thomas Adam]

On Sun, Oct 23, 2016 at 07:21:55AM +1000, Stuart Longland wrote:
> On Git flow projects, master branch is always the latest stable release.

I'm aware of git-flow, and it sucks.  A solution to a problem which for most
project won't exist.

If you were to do:

% git checkout master && git pull

Then you'd be running something that was stable, plus code in development for
the next release.  That's fine.  The only criteria for code making it onto
master is that it has gone through some testing.

If you want to use the latest stable version, you'd checkout that tag:

% git checkout -b 2.6.6 something/2.6.6

Beyond that, there's not much more to say about how branching and tagging
works.

-- Thomas Adam

Re: FVWM: pull requests

[Thomas Adam]

On Sun, Oct 23, 2016 at 06:52:46AM +1000, Stuart Longland wrote:
> On 23/10/16 02:54, Thomas Adam wrote:
> > On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
> >> > Yes, but that's actually not the part I was asking about.  How the
> >> > "git pull-request" should look like is not in the docs.
> > OK.  For that, you'd have to use their web interface.  See:
> > 
> > https://help.github.com/articles/about-pull-requests/
> 
> `git merge --no-ff ${BRANCH}` seems to be more-or-less equivalent.

No, it's the opposite.

Again, DEVELOPERS.md outlines why, and how to do this.  If it's not clear,
then I need to know so it can be improved.

> Is there going to be some sort of naming and usage convention around
> branches, e.g. like Git flow¹?  Or is 'master' where the action happens?

Did you read DEVELOPERS.md?  Don't misunderstand me, it's in that document,
and if it's not clear, I again need to know so I can improve it.  But what I
don't want to do is have to keep repeating the same bits of information when I
can point people towards that file.

-- Thomas Adam

Re: FVWM: pull requests

[Stuart Longland]

On 23/10/16 02:54, Thomas Adam wrote:
> On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
>> > Yes, but that's actually not the part I was asking about.  How the
>> > "git pull-request" should look like is not in the docs.
> OK.  For that, you'd have to use their web interface.  See:
> 
> https://help.github.com/articles/about-pull-requests/

`git merge --no-ff ${BRANCH}` seems to be more-or-less equivalent.

Is there going to be some sort of naming and usage convention around
branches, e.g. like Git flow¹?  Or is 'master' where the action happens?
-- 
Stuart Longland (aka Redhatter, VK4MSL)

I haven't lost my mind...
  ...it's backed up on a tape somewhere.

1. http://nvie.com/posts/a-successful-git-branching-model/

Re: FVWM: pull requests

[Thomas Adam]

On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
> Yes, but that's actually not the part I was asking about.  How the
> "git pull-request" should look like is not in the docs.

OK.  For that, you'd have to use their web interface.  See:

https://help.github.com/articles/about-pull-requests/

Or there's a command-line wrapper:

https://hub.github.com/

Or, I've mentioned in the docs about using 'git send-email'.

The reason it's not in the docs is because it's generally not a question that
gets asked, and that I'd rather try and keep what we have to document as
fvwm-specific as possible, due to the way GH changes, etc.

I'll review your diff right now.

-- Thomas Adam

Re: FVWM: pull requests

[Thomas Adam]

Hi,

Ensure master is up to date in your checkout, then on you topic branch:

git rebase master

If there were changes on master which weren't on your branch you'll have to
force push your topic branch out again to build in Travis. Then:

git checkout master
git merge topic-branch
git push

It's all in DEVELOPERS.md

HTH,
Thomas
On Sat, 22 Oct 2016, 15:42 Dominik Vogt,  wrote:

> Hi Thomas,
>
> I've actually never used pull requests, so what would be the
> correct command to generate a pull request for the
> dv-gcc-warning-fixes branch I've just pushed, to get it onto the
> master branch?  (Preferrably not using github.)
>
> Ciao
>
> Dominik ^_^  ^_^
>
> --
>
> Dominik Vogt
>