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

[Nigel Kersten]

On Wed, Sep 9, 2009 at 10:18 AM, Nigel Kersten<nigel at explanatorygap.net> wrote:
> So I'm all ready and then....
>
> $ git push --dry-run origin deb0250:master
> To ssh://nigelk-guest@git.debian.org/git/pkg-puppet/puppet.git
>  ! [rejected]        deb0250 -> master (non-fast forward)
> error: failed to push some refs to
> 'ssh://nigelk-guest@git.debian.org/git/pkg-puppet/puppet.git'
>
> and I completely forgot that I wouldn't be able to do this without --force.
>
> We don't have a lot of choice here if we actually want to replace
> master, we're going to end up screwing people who are following these
> branches due to the divergent history upstream for 0.24.x and 0.25.x.
>
> This problem shouldn't occur again according to upstream.
>
> I've created a master0.24.x branch on alioth that is a clone of the
> existing master.
>
> Anyone have a better suggestion than wiping out our existing
> master/debian branches and replacing them?

(really we're just rewinding the tip and then moving forwards on a
different time stream, but hopefully I illustrated the problem there)