https://pulp.plan.io/https://pulp.plan.io/favicon.ico2019-11-25T17:34:33ZPulpPulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=495562019-11-25T17:34:33Zbmbouterbmbouter@redhat.com
<ul></ul><p>This looks great. As a cherry picking person, I could really use this because it would let me cherry pick at the PR level.</p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=495802019-11-26T14:14:11Zdaviddavis
<ul><li><strong>Related to</strong> <i><a class="issue tracker-2 status-9 priority-6 priority-default closed" href="/issues/5808">Task #5808</a>: Have travis email us when a build fails</i> added</li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=495922019-11-26T15:45:49Zfao89
<ul><li><strong>Tracker</strong> changed from <i>Issue</i> to <i>Task</i></li><li><strong>% Done</strong> set to <i>0</i></li><li><strong>Sprint</strong> set to <i>Sprint 62</i></li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=495942019-11-26T15:47:24Zipanova@redhat.comipanova@redhat.com
<ul><li><strong>Groomed</strong> changed from <i>No</i> to <i>Yes</i></li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=498362019-12-06T14:43:54Zrchan
<ul><li><strong>Sprint</strong> changed from <i>Sprint 62</i> to <i>Sprint 63</i></li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=501052019-12-12T16:45:28Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>NEW</i> to <i>ASSIGNED</i></li><li><strong>Assignee</strong> set to <i>daviddavis</i></li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=514812019-12-18T13:31:00Zdaviddavis
<ul><li><strong>Tags</strong> <i>CI/CD</i> added</li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=515162019-12-19T15:10:58Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>ASSIGNED</i> to <i>POST</i></li></ul><p><a href="https://github.com/pulp/plugin_template/pull/157" class="external">https://github.com/pulp/plugin_template/pull/157</a></p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=515282019-12-19T17:30:14Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>POST</i> to <i>MODIFIED</i></li><li><strong>% Done</strong> changed from <i>0</i> to <i>100</i></li></ul><p>Applied in changeset <a class="changeset" title="Adding an automated cherry pick job fixes #5795 https://pulp.plan.io/issues/5795" href="https://pulp.plan.io/projects/pulp/repository/plugin_template/revisions/84d63defa6bd245a0e95e9682ee590f01b5cce40">plugin_template|84d63defa6bd245a0e95e9682ee590f01b5cce40</a>.</p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=515322019-12-19T20:44:45Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>MODIFIED</i> to <i>ASSIGNED</i></li></ul><p>The cherry pick process failed:</p>
<p><a href="https://travis-ci.com/pulp/pulpcore/jobs/269037561" class="external">https://travis-ci.com/pulp/pulpcore/jobs/269037561</a></p>
<p>The issue is that there are three ways to "merge" PRs in github. The first is by merging and the other two are rebasing and squashing. In the merge case, the SHAs in the PR match the commits in the repository. The cherry pick code uses these SHAs to cherry pick the changes from the PR.</p>
<p>In the other cases however, the SHAs are different because the changes have been rebased or squashed. The cherry pick code doesn't handle this possibility and will need to.</p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=515462019-12-20T13:04:06Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>ASSIGNED</i> to <i>POST</i></li></ul><p>Here is the fix to handle squashes and rebases. Warning, it's ugly.</p>
<p><a href="https://github.com/pulp/plugin_template/pull/159" class="external">https://github.com/pulp/plugin_template/pull/159</a></p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=515562019-12-20T15:49:41Zdaviddavis
<ul><li><strong>Status</strong> changed from <i>POST</i> to <i>MODIFIED</i></li></ul><p>Applied in changeset <a class="changeset" title="Update cherry pick processor to handle rebases and squashes fixes #5795" href="https://pulp.plan.io/projects/pulp/repository/plugin_template/revisions/7914425052c37b60d96696cc07e0b5748cf825c5">plugin_template|7914425052c37b60d96696cc07e0b5748cf825c5</a>.</p> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=526512020-01-31T11:24:28Zbmbouterbmbouter@redhat.com
<ul><li><strong>Sprint/Milestone</strong> set to <i>3.1.0</i></li></ul> Pulp - Task #5795: Automatically cherry pick bug fixes to the latest release branchhttps://pulp.plan.io/issues/5795?journal_id=526632020-01-31T11:25:15Zbmbouterbmbouter@redhat.com
<ul><li><strong>Status</strong> changed from <i>MODIFIED</i> to <i>CLOSED - CURRENTRELEASE</i></li></ul>