[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

RE:RE:Ad-hoc survey of existing Debian git integration tools

> dgit is a step in this direction.

Yes and it is nice to have meta data (the dgit things) rerpresenting the packages which can be shared between derivatives.

> I'm not sure I entirely understand your situation, but:

Yes I was a bit laid at this moment :)

> If you are a downstream, there is no need at all for you to generate
> and work with source packages.  Instead, you could keep your source
> code entirely in git, and build binaries directly out of git clones.

Yes but if peoples are using autotools they do not necessarely put all the autogenerated files in the git repository.
so if you want at the end to set up some intégration branch where all the autogenerated files are integrated.

or maybe this sort of bootstrapping should be part of the build process, or the job of the get-orig-source make target ?

> If want to do this, the dgit view of the Debian archive is a good
> starting point, because it is a uniform view of the archive: a git
> branch containing an editable, buildable package.

So we need to agreed on a convention in order to let the upstream do the job of integrating their work in the Debian archive.
Or at least to prepare something which could integrate the Debian archive in the end.

> If you find that you want to edit the upstream source, you can make
> your changes on an upstream git branch, and then merge or cherry pick
> that into your packaging branch.

Does it mean that the dgit repo will contain also the upstream repository ?

> If you want to feed your changes back to Debian, you need to provide
> the maintainer with the format that they are expecting.  If the
> maintainer is using git, a git branch (with reasonably clean history)
> is probably a good bet, but you should ask the maintainer.

dgit should propose a sort of PR (via email) in order for the upstream to propose the integration of its prepared package into the repository.
something which is done for now via mentors, maybe

does dgit propose to intégrate also the pacakges on mentors

This way it should be easy to do some packaging review.

> If you are the maintainer, then you can simply dgit push into Debian
> from your packaging branch.  If you have made the git history
> complicated (eg, with merges), you may need to either linearise it
> somehow yourself, or simply switch away from `3.0 (quilt)'.

I do not understand this part why a non linear history is a problem for dgit ?



Reply to: