[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#683184: RFS: suckless-tools/39-1 [ITA]


(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
  * git checkout master && git merge -s ours squeeze

Also, given "previous maintainer had his own repository in his own
domain", importing their history, merged with "ours" strategy, may be
an option too.

  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr.asc

Reply to: