[Aptitude-devel] Rebasing published software and avoid git revert/merge

[Daniel Hartwig]

On 5 September 2012 15:48, Thomas Goirand <zigo at debian.org> wrote:
> I never understood why everyone insist in using the default name "master".
> This doesn't express anything at all. Instead, you should be using:
>
> - wheezy
> - sid
> - experimental

Right.  That has been a sort of long-term goal ;-)

For historical reasons, aptitude is a non-native package.  We have a
combined gbp and upstream setup at the moment:

- master (“upstream” development)
- upstream (merged from master via git-import-orig)
- debian (merged from upstream)

[I have a local branch, stable-0.6, which is split from master at .8.
This is the branch I want to replace master with; it has no debian/
directory.]

I had planned to merge debian to master after Wheezy, making this a
native package, and drop the upstream and debian branches.  Perhaps
instead of waiting I should just do both now, creating the wheezy/sid
branches and forget about master.