[Pkg-giraffe-discuss] Z-push: Q about bug fix

[Roel van Meer]

Guido Günther writes:

> > Create a new branch debian/experimental based on the tag
> > 'debian/2.4.0_beta1-1'.
> > Then revert all commits on debian/sid so you are back on 'debian/2.3.8-2'.
> > Now import the updated version of the upstream source and do the fixing
> > of the bug report on top of the updated debian/sid branch.
> >
> > By this we would have the debian/experimental branch existing for later
> > usage on other upstream versions for the experimental archive but can go
> > on with the current package version in unstable.
> > Not really nice but acceptable I think.
>
> That will make merging in debian/experimental harder since git notices
> that the changes are alread in. You can work around this with a fake
> merge though.

How about this:

I revert all the commits done for 2.4.0-beta1. Then I import the updated  
2.3.8 source on debian/sid and fix the bug there. From that release, we  
branch d/experimental. We leave it at that for now. 2.4.0-beta2 can then be  
imported on experimental without any merge problems.

One thing I am thinking about is which version to assign to the updated  
2.3.8. It could be 2.3.8.1, 2.3.8b, something else? I think we cannot reuse  
2.3.8 as is because of conflicts with tags and such. Personally I would go  
for 2.3.8b. Are you okay with that?

Thanks,

Roel