oh boy, 1 package, 2 repositories

[Mo Zhou]

Hi Dominique,

IMHO simply rebasing 0.8.4-2 to the master branch of salsa should be enough.

0. git clone salsa.../perl6-zef
1. gbp import --pristine-tar ../perl6-zef_0.8.4.orig.tar.gz
2. rebase the patches to the master branch

In this way you won't have to overwrite the whole history, risking to
mess up more things ...

On Sat, May 30, 2020 at 05:53:26PM +0200, Dominique Dumont wrote:
> On vendredi 29 mai 2020 18:51:03 CEST Dominique Dumont wrote:
> > The only way out I can see is to force merge perl6-zef repo into zef.
> 
> Another way out may be to:
> - recreate the history in per6-zef starting from perl6-zef/debian/0.6.2-2
> - cherry pick changes from both repo up to last release (and gbp import 
> tarballs from github to re-create upstream and pristine-tar branches)
> - push --force the result on perl6-zef
> - delete zef repo on salsa
> 
> I'd rather keep perl6-zef repo on salsa because the name matches perl6-zef 
> source package name.
> 
> Unless someone disagree, I'll try this way next week.
> 
> All the best
> 
> 
> 
> 
> 
> 
> _______________________________________________
> Pkg-rakudo-devel mailing list
> Pkg-rakudo-devel at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-rakudo-devel