[Pkg-samba-maint] (forw) [Samba] [Announce] Samba 4.0.6 Available for Download

[Jeroen Dekkers]

At Sat, 25 May 2013 23:52:28 +0200,
Ivo De Decker wrote:
> On Tue, May 21, 2013 at 06:12:58PM +0200, Christian PERRIER wrote:
> > Of course, "git-import-orig" will certainly do the job, but wouldn't
> > there be a possibility to "link" to upstream's git and merge the
> > difference from there?
> 
> Why would you want to do that? 

If you also put the debian patches on a patch queue branch with for
example gbp-pq
(https://honk.sigxcpu.org/piki/development/debian_packages_in_git/)
having the upstream git linked makes it very easy to backport upstream
commits or push debian patches upstream. Backporting a commit will be
simple a matter of changing to the patch queue branch and doing a git
cherry-pick.

It also makes it possible to do more advanced things, such as easily
creating packages from unreleased upstream git or even set up
something like continuous integration where the upstream master branch
is automatically merged and Debian packages are built.

> That would mix our repo and the upstream one
> and make it more difficult to keep track of what originated where. 

I don't really see how this can be a problem, because everything under
the "debian" directory originates from Debian packaging, everything
else from upstream and patches to the upstream source must be put in
debian/patches.

> In the
> current repo, there is some similarity between certain branch or tag names
> that are used in both repos for different things. This would need to be
> clarified. Also, we would need a workflow to fix the dfsg repackaging.

There is no need to copy the branches or tags of the upstream git
repository. The only thing what happens when you use the
git-import-orig -u option is that the commit that imports the source
has the specified upstream commit as an extra parent. No tags or
branches are changed/added by this, but if you do a "git log" and "git
blame" etc. on the upstream source you will see the upstream commits
instead of only the git-import-orig commits.

As far as I can see the only downside is that the size of the Debian
packaging repository will be bigger because it also includes the whole
upstream history, but given that the packaging repository is already
pretty big that shouldn't be a problem.