Skip to content

Mapping of m3u, m3u8, pls to audio streams#28875

Merged
PVince81 merged 1 commit into
owncloud:masterfrom
Rello:patch-2
Sep 1, 2017
Merged

Mapping of m3u, m3u8, pls to audio streams#28875
PVince81 merged 1 commit into
owncloud:masterfrom
Rello:patch-2

Conversation

@Rello

@Rello Rello commented Aug 31, 2017

Copy link
Copy Markdown
Contributor

Usage of m3u, m3u8, pls as audio playlists according to their standard
https://en.m.wikipedia.org/wiki/M3U
https://en.m.wikipedia.org/wiki/PLS_(file_format)

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@PVince81 PVince81 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 assuming you tested this already

@PVince81 PVince81 added this to the development milestone Aug 31, 2017
@PVince81 PVince81 merged commit 0a08022 into owncloud:master Sep 1, 2017
@PVince81

PVince81 commented Sep 1, 2017

Copy link
Copy Markdown
Contributor

@Rello please backport to stable10

@Rello

Rello commented Sep 1, 2017

Copy link
Copy Markdown
Contributor Author

@PVince81 can you help me "how" I need to backport? then I will take care

@phil-davis

phil-davis commented Sep 2, 2017

Copy link
Copy Markdown
Contributor

You need a local clone of the core repo, then something like:

git checkout master
git fetch origin
git pull
git checkout stable10
git pull

That makes sure that your local clone is up-to-date in both branches.
Then from being on stable10 branch, make a new branch off it:

git checkout -b stable10-m3u

Then find the commit id (SHA) of the commit in master that needs to be backported. Look in GitHub https://github.com/owncloud/core/commits/master and copy the relevant "magic number". Do a cherry-pick:

git cherry-pick fb5b2497c85cf2791960001c7e5861fefc4fcdfb

then push it up to GitHub:

git push --set-upstream origin stable10-m3u

Then on GitHub make a pull request and choose "stable10" as the base for the pull request.

I did the above and ended up with PR #28885

@phil-davis

Copy link
Copy Markdown
Contributor

Backport stable10 #28885

@PVince81

Copy link
Copy Markdown
Contributor

I forgot to verify this: #28967

@lock

lock Bot commented Aug 2, 2019

Copy link
Copy Markdown

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants