Re: debian-science git repository
Hi Teemu,
thanks for this nice guide! I found it quite interesting to see that my
workflow with Git is quite similar to yours. This should make writing a
policy a little easier than I expected. (Working on this right now.)
Am Donnerstag, 15. Mai 2008 18:04:14 schrieb Teemu Ikonen:
> Upstream sources are kept in the 'upstream' branch and updated from a
> tarball every time there is a new release. It's also possible to set
> up a branch which is periodically synchronized from the upstream VCS
> via a cron job calling git-svn or similar, if one wants to track
> development versions.
Just out of interest: I know people that use the branch "upstream" to follow
upstreams VCS and "release" for the import of release tarballs. I found that
a little inconvenient because git-buildpackage needs to be configured to
use "release" instead of "upstream" if one does not have an upstream VCS to
follow. Do you have experiences with that?
BTW, thanks for the tip of pristine-tar! I had a look at it and love it! (It's
also great for SVN packaging.)
> When developing patches which touch the upstream sources, create a new
> branch for each patch, branching from 'upstream'. This way the
> development history for each feature branch is clean and the patch can
> be easily submitted to the upstream author if necessary. These feature
> branches, if not submitted to upstream, should be merged with the
> upstream branch every time a release is made, to resolve possible
> conflicts.
I usually use "bug-nnn" branches for fixing bugs, though the name can be
anything of course. Do you have a (personal) policy on this?
> echo 'ref: refs/heads/debian' > HEAD
I also got used to set HEAD to the "debian" branch. I like to clone a
build-ready package.
Best regards
Manuel
Reply to: