git workflows for general Ubuntu development

[Sean Whitton]

Dear Robie,

On Tue, Nov 15, 2016 at 05:41:56PM +0000, Robie Basak wrote:
> On Tue, Nov 15, 2016 at 10:24:32AM -0700, Sean Whitton wrote:
> > The most important part of the tutorial for realising this is putting
> > "single-debian-patch" and "auto-commit" in debian/source/options, but I
> > would also encourage you to read the section "Sample text for
> > README.source".
> 
> If this is necessary, then it breaks our use case unless you can also
> require all Debian packages to switch to dgit first.
> 
> In Debian, a package maintainer can decide to switch VCS system and
> write things in README.source to explain how things should be done.
> 
> In Ubuntu, switching a package's VCS, debian/source/options, and so
> forth would make it increasingly difficult to maintain a delta against
> Debian. In general we never add such a (VCS of debian/source/options)
> delta. Whatever solution we employ, it must be able to work with
> unmodified Debian source packages.

Okay, I see what you mean.  I support my suggestion was actually quite
radical: adding those two lines to d/source/options for every package
you maintain a delta for.  In that case, the merges would be easy (a
simple helper script that ensured the lines were present post-merge) and
you wouldn't need README.source because everyone would know that was how
things worked.  But that would be a massive social change!

-- 
Sean Whitton
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20161115/29176152/attachment.sig>