Hello everyone,

I'd like to bring to your attention the force push on master for
PDL v2.012.

Due to the indexing problems brought up in 
<http://sourceforge.net/p/pdl/bugs/389/>,
we had to make a new release of PDL 2.012 
<http://permalink.gmane.org/gmane.comp.lang.perl.pdl.devel/6535>.

However, this release left off some commits that were already in master
and to make master reflect the released code, we had force-push PDL 2.012's
changes to master.

Those changes that were dropped (from Derek Lamb, Ed, and myself) are
now on the `unmerged-to-master-drop-2.011_01` branch and I propose that
we do not merge them on to master until we can be sure that PDL 2.012
<https://github.com/PDLPorters/pdl/pull/123> has indexed properly.

If you have code on a branch that has already has moved past the
2.011_01 commit[^1], then you can fix that branch by running

    git fetch                       # get the latest changes
    git rebase -i origin/master     # interactive rebase

and in the editor window that pops up, delete the following 4 lines

    pick 9129b36 Update VERION to 2.011_01 for more development
    pick 2d7c932 Let PDL::DiskCache::sync accept an argument of which element 
to sync.
    pick 81b5f37 2 small cleanups in slices.pd
    pick b55b188 Add curly braces to remove -Wdangline-else

If you have any questions, please let me know.

Cheers,
- Zaki Mughal


[^1]: You can check this by seeing if the output for

          git log | grep 2.011_01

      is

          Update VERION to 2.011_01 for more development

      then your branch contains the commits that are no longer on
      master.

------------------------------------------------------------------------------
_______________________________________________
pdl-devel mailing list
pdl-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pdl-devel

Reply via email to