Hello Ian,
On Fri, Jan 06, 2017 at 03:29:38PM +0000, Ian Jackson wrote:
> Sean Whitton writes ("Re: Feedback on 3.0 source format problems"):
> > Could you explain in general terms the difference between the
> > interchange and packaging-only branches
>
> See modified diagram below. Are the annotations I have added (and the
> name change) any help ?
Yes, thanks, I think I see most of what's going on now. Thank you for
taking the time to draw the diagrams. It's certainly an ingenious use
of git.
I take it that only the maintainer is meant to look at the
merging-baseline, and everyone else looks at the interchange view. My
first worry is that pseudomerges are weird. In fact, I've never seen
them outside of weird Debian git workflows :) Someone might look at the
interchange view, see all these pseudomerges, and have no idea how to
interpret what the Debian maintainer is doing. Do you have any thoughts
on mitigating the potential confusion?
The advantage of thinking of the Debian packaging as just another branch
of development is that the branching structure itself is easy to
interpret for anyone who uses git. "Ah, I see they merged my release
tag into their branch, they must have been bringing Debian up-to-date
with the latest release" -- this is very natural for git users. We call
it "packaging a new upstream release" but it's easier for an outsider to
think of it as bringing a feature branch up-to-date with the latest
mainline developments.
--
Sean Whitton
Attachment:
signature.asc
Description: PGP signature