Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.0.0.rc1] man: add tty option and tfix #162

Closed
wants to merge 5 commits into from

Conversation

wking
Copy link
Contributor

@wking wking commented Jul 28, 2016

Backporting #154 to v1.0.0.rc1 following the first procedure here.

Mrunal Patel and others added 5 commits July 25, 2016 11:35
…an-page

Makefile: clean up compiled man page
Use Generator pointers as methods receivers
…remove-unusefule-default-value

generate: remove unuseful default value for output
…-to-validate

move defaultCaps to validate
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
@mrunalp
Copy link
Contributor

mrunalp commented Jul 28, 2016

I see 5 commits including 4 merge commits. Is that intentional?

@wking
Copy link
Contributor Author

wking commented Jul 28, 2016

On Thu, Jul 28, 2016 at 04:04:28PM -0700, Mrunal Patel wrote:

I see 5 commits including 4 merge commits. Is that intentional?

562e912 was behind #140 landing:

$ git log --graph --oneline --decorate f0ecc98 | head -n6

so I just PRed it directly without cherry-picking. The only thing we
don't want in v1.0.0.rc1 is 6e7b418 and stuff that needs those Linux
pointers.

@wking
Copy link
Contributor Author

wking commented Jul 28, 2016

On Thu, Jul 28, 2016 at 04:15:30PM -0700, W. Trevor King wrote:

562e912 was behind #140 landing:

$ git log --graph --oneline --decorate f0ecc98 | head -n6

And that would be easier to see if the graph actually included 562e912
:p. Here's a better view:

$ git log --graph --oneline --decorate f0ecc98 562e912 | head -n6

So 562e912 is based on the last master commit before #140 landed.

@wking wking changed the title man: add tty option and tfix [1.0.0.rc1] man: add tty option and tfix Aug 3, 2016
@wking
Copy link
Contributor Author

wking commented Sep 28, 2016 via email

@Mashimiao
Copy link

I think your branch man-add-tty-and-tfix may checkout from wrong branch. you may need create a new man-add-tty-and-tfix branch again and push PR again.

@wking
Copy link
Contributor Author

wking commented Sep 28, 2016

On Wed, Sep 28, 2016 at 01:22:13AM -0700, Ma Shimiao wrote:

I think your branch man-add-tty-and-tfix may checkout from wrong
branch. you may need create a new man-add-tty-and-tfix branch again
and push PR again.

562e912 (originally submitted as #154) branched off of master before
the 1.0.0.rc1-breaking runtime-spec bump 1. So this is good to
merge into v1.0.0.rc1 without any need to cherry-pick anything. And
avoiding unnecessary cherry picks makes life easier on Git if/when we
eventually merge v1.0.0.rc1 into master to pickup the v1.0.0.rc1-only
commits (#181).

@Mashimiao
Copy link

anyway, 4 merge commits is not expected. Maybe reset would make any sense?

@wking
Copy link
Contributor Author

wking commented Sep 29, 2016

On Thu, Sep 29, 2016 at 01:48:08AM -0700, Ma Shimiao wrote:

anyway, 4 merge commits is not expected.

Am I just explaining it poorly? Or does the explanation make sense
and you just prefer a cherry-picks for a simpler v1.0.0.rc1 history?
If we go with the cherry-picks here, do you want more cherry picks
instead of a merge in #181?

I think this would be a lot less work if we just focused new PRs on a
branch pinned to a specific runtime-spec release instead of putting
most development work into a branch that floats with runtime-spec's
master. But I pitched that in #140 and don't seem to have made a
convincing-enough argument ;).

@wking wking closed this Jan 21, 2017
@wking wking deleted the man-add-tty-and-tfix branch January 21, 2017 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants