[Pkg-puppet-devel] developing the 0.25.0 debs...

[Nigel Kersten]

so I'm hoping Micah or someone has more git-fu than I do, as I can't
see the best way forward to do this.

We can't just merge the upstream 0.25.0 git branch into ours as far as
I can see, due to the fact they forked a while ago.

I also can't see how to use git cherry-pick to consolidate the
debian-specific commits with a new 0.25.0 based branch.

Hopefully I'm over-thinking this and there's a reasonably simple solution....

I'd quite like to produce 0.25.0-rc1 debs for people to be able to test with.