On 14:53 Sun 14 Oct , intrigeri wrote:
> Hi,
>
> (meta: I'm Vasudev's AM ;)
>
> Vasudev Kamath wrote (12 Oct 2012 03:31:39 GMT) :
> > On Fri, Oct 12, 2012 at 12:28 AM, Jakub Wilk <jwilk@debian.org> wrote:
> >> New repository for the squeeze branch feels wrong to me
>
> FWIW it feels wrong to me to. That's what branches are for.
>
> Note that branches in the same repository don't necessarily have to
> share common ancestors: e.g. the pristine-tar branch, when using gbp +
> pristine-tar, does not share its history with the upstream and
> packaging branches.
>
> > Well it is actually wrong but I can't see other altenative but
> > I think I will try it on -mentors and see if others have any
> > good idea.
>
> > One thing I can think is just remove existing suckless-tools
> > repository (I any how have my local copy) then rename
> > suckless-tools-38 to suckless-tools and on top of this import my 39
> > work so 38 history and 39 both can leave together. Let me see
>
> Rewriting already published branches' history is a no-go.
>
> What I would suggest is:
>
> * create a squeeze branch in the existing repository (from scratch,
> no shared ancestors)
> * import the needed and missing (older) version into the squeeze
> branch
Done the package now resides under wheezy branch. To be frank every
problem has simple solution :) I was overly complicating it thanks for
heads up ;)
> * git checkout master && git merge -s ours squeeze
Well *wheezy* branch will go independent of master. If you think it
can be merged please let me know your thoughts :-)
--
Vasudev Kamath
http://copyninja.info
Connect on ~friendica: copyninja@{frndk.de | vasudev.homelinux.net}
IRC nick: copyninja | vasudev {irc.oftc.net | irc.freenode.net}
GPG Key: C517 C25D E408 759D 98A4 C96B 6C8F 74AE 8770 0B7E
Attachment:
signature.asc
Description: Digital signature