Skip to content

Teach cherry_picker to forwardport to master #270

Closed
Closed
Teach cherry_picker to forwardport to master#270

Description

@andresdelfino
andresdelfino
opened on Jun 24, 2018

In #7765 , I opened a PR for 3.6 that was intended for master. After it was committed, I had to forwardport it to master.

When trying to do that, cherry_picker throw an error because it doesn't expect branch names without the X.Y format.

I ended up editing the script for this particular PR.

I know this isn't usual, but if deemed useful, I can take the task and make a PR.

Activity

  1. andresdelfino commented on Jun 24, 2018

    @andresdelfino
    andresdelfino
    on Jun 24, 2018
    ContributorAuthor

    python/cpython#7765

  2. Mariatta commented on Jun 24, 2018

    @Mariatta
    Mariatta
    on Jun 24, 2018
    Member

    Thanks, but I'm -1 on this idea. It is not an official CPython's workflow.

    cherry_picker is convenience tool, and I don't think we should make forward porting too convenient.
    (core devs going to need to be more careful next time 🙂).

    I think we will focus on preventative measures, as discussed in #211 and python/bedevere#111.

    It could also be ported manually the old fashioned way, using git cherry-pick

    git fetch upstream
git checkout -b port-pr-x-to-master upstream/x.y
git cherry-pick -x commithash
git push origin port-pr-x-to-master
...
  3. Mariatta
    closed this as completedon Jun 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions