[Pulp-dev] do we have master branch screwed up?

[Patrick Creech]

I just took a look while doing the branch updates for the release engineering process.  After merging forward 2.13-dev -> 2.14-dev -> master (updating for 2.13.4), I went on master and cherry-picked
those two commit hashes.  They did bring along new changes, and pushed them up to master along with the rest of the merge fowarding.  THe code changes should be there now.

On Thu, 2017-09-07 at 08:59 -0400, Bihan Zhang wrote:
> Ina I think the problem with both of those is that the committer (you and me) did not merge forward before the release engineer called the update-version-and-merge-forward.py script.
> 
> update-version-and-merge-forward.py does the merge with ours strategy[0] (to keep the correct release version on forward merge); so it brings the merge commit over but does not keep the changes.
> 
> I am not sure how to move forward in this case- should we just cherry pick the commits back into master? what are your thoughts pcreech?
> 
> [0] https://github.com/pulp/pulp_packaging/blob/master/ci/lib/promote.py#L243
> 
> On Thu, Sep 7, 2017 at 5:57 AM, Ina Panova <ipanova at redhat.com> wrote:
> > Today i accidentally stumbled across some inconsistencies on pulp/pulp master branch while looking into some Nectar related stuff
> > 
> > 1) master branch has the commit ab277d4f9c11cb539ed82236881621962b8ef721 in the git history
> > 2) git blame or git history of the file itself does not show anything, the code change is not on master.
> > 3) 2.-14dev branch which was branched from master does contains the commit and the code changes.
> > 
> > Same for f36a5b96ad60d594cc875faf0ce395d80d63ac75 which is the fix for #2783, i cannot see the code changes on master branch.
> > 
> > Is there any black magic happening again?
> > 
> > 
> > --------
> > Regards,
> > 
> > Ina Panova
> > Software Engineer| Pulp| Red Hat Inc.
> > 
> > "Do not go where the path may lead,
> >  go instead where there is no path and leave a trail."
> > 
> > _______________________________________________
> > Pulp-dev mailing list
> > Pulp-dev at redhat.com
> > https://www.redhat.com/mailman/listinfo/pulp-dev
> > 
> 
> _______________________________________________
> Pulp-dev mailing list
> Pulp-dev at redhat.com
> https://www.redhat.com/mailman/listinfo/pulp-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/pulp-dev/attachments/20170913/9f293ea0/attachment.sig>