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

[Steve Langasek]

On Tue, May 21, 2013 at 06:12:58PM +0200, Christian PERRIER wrote:
> That seems to be a good opportunity to document the "merge new
> upstream version" process into git.

> 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?

With respect to long-term scalability of the git repo, yes, we definitely
want to be merging the upstream branch as well as having a suitable
"tarball" branch, with our pristine-tar generated against that.  I don't
know what current best practices are for achieving this in the git world, so
I would definitely welcome having this documented.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20130521/0148a47a/attachment-0001.pgp>