[Pkg-bazaar-maint] builddeb questions

[James Westby]

On (30/06/07 19:13), James Westby wrote:
> and for native packages you just let linear history. However there may
> be some packages that go through a period of being native and back (one
> way changes may be quite common). I am unsure of what to do in those
> cases. Does it make sense to do the following
> 
> 
>   packaging  ----*----*             *----*
>                 /    / \           /    /
>   upstream ----*----*---*----*----*----*
>                         ^         ^
>                         |         |
>   first native version_/           \_upstream of first non-native.
> 
> 
> It makes the history a bit funny as the upstream branch contains
> packaging work, but it seems like that is right, as that is a native
> package.
> 

So, I have just tried to implement this, but it is little trickier than
I thought. It seems to be working quite well, but the native->non-native
transition is a little strange. Taking the simple case:


  packaging           *
                     /
  upstream ----*----*


There is no link between the packaging branch and the packaging in the
native package. This means that the history of debian/changelog is
broken at this point (the file-ids are different in the two parts).

You could have the packaging start with a merge

  packaging      _----*
                /    /
  upstream ----*----*

but that seems slightly odd. I could also keep the file-ids the same,
but not add the extra parent. This would associate the two parts, but
again would be strange.

The other alternative is just not to bother, and leave the break in the
history.

Any opinions?

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256