Hi,
A long time ago, probably early 2012, I or someone like me (but most
likely me) moved Products.PloneHelpCenter from svn.plone.org/collective
to github.com/collective. Unfortunately, this person (me) forgot to svn
rm trunk and leave a note in the old repo (svn.plone.org/collective).
So, some hilarity ensued:
- A bunch of commits continued to happen on svn.plone.org
- David Glick (davisagli) made three commits to master.
- Luke Brannon (lukebrannon) created a branch called 'sortByVersion'
It gets better.
First, a month or so ago I noticed the mistake. Today, in honor of the
start of the Plone conference, I fixed everything. First I forked PHC
to my personal account
(https://github.com/aclark4life/Products.PloneHelpCenter). Then I did a
"normal" migration, but when it came time to push I forced the push
with:
$ git push -u origin master -f
You normally never want this, but in this case I wanted to re-import
the contents of the current svn repository and overrite the
inadvertently errant GitHub repo. At this point, I was ready to
manually fix David Glick's commits if necessary. But two happy
accidents occured:
- Because I forced the push (instead of destroying the repo and
recreating it) I inadverently preserved Luke Brannon's branch \o/
- Even better, that branch had David Glick's commits in it. \\o \o/ o//
So it this point I realized how fortune I was, I cherry picked David's
commits[1] and pushed. Everybody happy, I hope. If you care, please
compare:
- https://github.com/collective/Products.PloneHelpCenter
With:
- https://github.com/aclark4life/Products.PloneHelpCenter
I'm pretty sure everything is in order, but I'd appreciate other eyes
on it. I've svn rm'd the old trunk and left a note.
Alex
--
Alex Clark ยท https://www.gittip.com/aclark4life/
_______________________________________________
Product-Developers mailing list
[email protected]
https://lists.plone.org/mailman/listinfo/plone-product-developers
