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

linkage issue fixes due to inlined functions #3815

Merged
merged 1 commit into from Oct 11, 2017
Merged

Conversation

@devnexen
Copy link
Contributor

@devnexen devnexen commented Sep 19, 2017

Spotted on OS X.

@tresf
Copy link
Member

@tresf tresf commented Sep 19, 2017

@devnexen thanks! This has been breaking on my machine as well. Can you please also submit a PR to https://github.com/swh/ladspa? (this redundant exercise won't be necessary once we get #3489 properly coded, merged and submoduled).

@devnexen
Copy link
Contributor Author

@devnexen devnexen commented Sep 25, 2017

@tresf Seems done swh/ladspa#50

@tresf tresf changed the base branch from master to stable-1.2 Sep 25, 2017
@tresf tresf changed the base branch from stable-1.2 to master Sep 25, 2017
@tresf
Copy link
Member

@tresf tresf commented Sep 25, 2017

@devnexen Thanks again.

I'm sorry for the inconvenience, but since this is needed for our next stable release, we will need to be merged into stable-1.2 and then we'll sync it back to master. This may seem counter-intuitive, but that's how we're handling the branch drifting. I've attempted to rebase using the GitHub GUI, but it threw the PR out of whack. After switching this to go against stable-1.2 I believe the branch needs to be rewound to the state of stable-1.2 and then the commit can be cherry-picked and the PR should be OK. This will auto-close the PR if the commit isn't cherry-picked before pushing. (that's what happens if state of HEAD matches comparison HEAD). So it may be easier to just open a separate PR.

@Umcaruje Umcaruje added this to the 1.2.0 milestone Oct 2, 2017
@Umcaruje Umcaruje added this to In Progress in Release LMMS 1.2.0-RC5 Oct 2, 2017
@tresf tresf changed the base branch from master to stable-1.2 Oct 11, 2017
@tresf
Copy link
Member

@tresf tresf commented Oct 11, 2017

Force rebased against stable-1.2. Merging.

@tresf tresf merged commit 54f3ecc into LMMS:stable-1.2 Oct 11, 2017
1 check was pending
1 check was pending
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@zonkmachine zonkmachine moved this from In Progress to Done in Release LMMS 1.2.0-RC5 Oct 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.