[swift-corelibs-dev] Cherry-picking changes for the next Swift release?

Tony Parker anthony.parker at apple.com
Wed Oct 12 12:25:07 CDT 2016

Hi Alex,

> On Oct 12, 2016, at 9:52 AM, Alex Blewitt via swift-corelibs-dev <swift-corelibs-dev at swift.org> wrote:
> I have a couple of Calendar related fixes into swift-corelibs-foundation master:
> https://github.com/apple/swift-corelibs-foundation/pull/675 <https://github.com/apple/swift-corelibs-foundation/pull/675>
> https://github.com/apple/swift-corelibs-foundation/pull/677 <https://github.com/apple/swift-corelibs-foundation/pull/677>
> How do I go about cherry-picking these to be in the next release? There are several remote branches that have the 'swift-3' moniker including several 'preview' ones:
>   origin/swift-3
>   origin/swift-3.0-branch
>   origin/swift-3.0-preview-1-branch
>   origin/swift-3.0-preview-2-branch
>   origin/swift-3.0-preview-3-branch
>   origin/swift-3.0-preview-4-branch
>   origin/swift-3.0-preview-5-branch
>   origin/swift-3.0-preview-5-speculative
>   origin/swift-3.0.1-preview-2-branch
> Why are we representing previews as branches, instead of tags? If I wanted to submit a pull request for one of these previews, it's not clear which one(s) I should target.

I agree this is a bit confusing.

Right now, swift-3.0-branch is the one that is used as the “development” branch for any updates to swift 3.0.

> There are also a number of branches that are old (in many cases, over a month):
>   origin/dabrahams-patch-1
>   origin/dabrahams-patch-2
>   origin/data-associated-type-fixes-3.0
>   origin/more_value_types
>   origin/nscoding
>   origin/revert-540-SR-2151
>   origin/revert-567-pr-grabbag
> Can we get these cleaned up if they are no longer necessary?
> Alex

Yes, I think we should delete these. I’ll do that for a bunch of these.

- Tony

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.swift.org/pipermail/swift-corelibs-dev/attachments/20161012/117802ed/attachment.html>

More information about the swift-corelibs-dev mailing list