Merging upstream git history into the debian packaging history?

[Felipe Sateler]

Hi, I wonder if anybody who has tried the new workflow of merging in
the upstream history could share their impressions on it? I'm
considering using it, but some questions arise:

1. How to manage stripped upstream taballs? do we not care about
shipping upstream code in git that we bother to strip in the debian
source tarball?

2. Managing patches:  it looks to me like the new workflow makes it
better to make changes directly to the sources (by cherry-picking the
appropriate commits/ merging the appropriate debian-specific branches)
and setting single-debian-patch in local-options. Has anyone tried
this?

3. Resolving conflicts between upstream released tarballs and the
upstream git repo (possibly due to autogen files). Simply override
anything with the contents of the latest tarball? I believe this is
what gbp does, but not sure.



-- 

Saludos,
Felipe Sateler