On Thu, Jun 25, 2009 at 01:49:17PM +0200, Raphael Hertzog wrote: > On Thu, 25 Jun 2009, Julien Cristau wrote: > > On Thu, Jun 25, 2009 at 09:20:51 +0200, Raphael Hertzog wrote: > > > > > As far as branches are concerned, the default branch should point to > > > the debian packaging branch and that's it. > > > > And how do you do that, when the debian and upstream repos are the same? > > That seems to be a fairly arbitrary limitation. > > It depends on the Vcs, bzr URL include the branch for instance. > > In the case of git, I don't have any nice answer. But you can always setup > a mirror on git.debian.org where HEAD points to the right branch.
This seems needlessly complicated. One should not need to munge the repository to work around arbitrary tool limitations. > Or we can define a standardized name. If the branch "debian" exists, it > should be used, otherwise "master" is supposed to be the debian packaging > branch. This is taking a rather blinkered view. The branch names should in no way be hard coded into our tools. While a default is reasonable, not having a means of overriding them without manual assistance on every use of the command significantly hampers both flexibility and usability. As well as the issue already pointed out that the upstream may share the repository, so the Debian-centric view that "master" is the Debian branch, there may also be *several* Debian branches. I often have branches for: - unstable - experimental - stable - backports and there may be others of course. Each of these may be branched off the upstream stable/development branches at the appropriate points. This allows supporting stable/stable-security and current development all in the same repository. You just can't do that with one branch. It was mentioned that debian/gbp.conf could be created to specify the required information. This is great. However, for source formats such as 3.0 (git) the branch to check out must be specified, and it must be in the .dsc (since you need to check out a specific branch to get the files). If it can't be specified here, we end up with just the master branch, and that's wrong in many cases. Regards, Roger -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
signature.asc
Description: Digital signature
