On Tue, 19 Oct 2010, James Vega wrote:
> > For quite a few packages of mine I use non-default branch to contain debian
> > packaging on top of the upstream sources. Such happens due to various
> > reasons
> > (e.g. I am also involved in upstream development and master branch in GIT
> > tracks actual upstream development).
> Do you mean that the git repository is being hosted with the upstream
> repository or just that the repository for the Debian package also
> contains the upstream sources?
some times it is the latter, some times both ;-)
> If it's the latter, then why not make
> the branch from which the Debian package is built the default branch of
> the repository?
and that is the approach the other member of our NeuroDebian team
adheres to -- sets up custom push refs so whatever is present on alioth
as "upstream" branch gets pushed into github (where he collaborates with
upstream) as the "master" branch. Clearly that requires local setup in
.git/config and creates too much of "undocumented" customization
to my taste... imho having branch names corresponding among different
clones for the same repository is less confusing; and is plain situation
for the former case (upstream repo is also serving debian/ packaging in
a branch)
> I don't think adding heuristics to debcheckout about which branch should
> be considered the "default" branch is the right thing to do. The
> suggested heuristics aren't guaranteed to be correct (multiple branches
> may have a debian/changelog or debian/gbp.conf). Also, the suggested
> mechanism means that the branch that gets checked out will vary based on
> when the checkout is performed.
even though I liked my little snippet -- I agree that use of such
heuristics is unreliable.
Do you think it might be feasible to support
X-Vcs-debian-branch
or just
X-Vcs-branch
field which would instruct explicitly which branch to use?
--
.-.
=------------------------------ /v\ ----------------------------=
Keep in touch // \\ (yoh@|www.)onerussian.com
Yaroslav Halchenko /( )\ ICQ#: 60653192
Linux User ^^-^^ [175555]
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
