Last steps to Mame 0.148

[Jordi Mallach]

On Sat, Jan 26, 2013 at 12:07:53AM +0100, Cesare Falco wrote:
> > Well I think you should push your changes in the "master" branch.
> I understand Jordi is working on 0.147 to make it fit the repository, so
> I chose to make a new branch for the time being.
> 
> I've just published debian/0.148, already merged with both master and
> debian/0.146.
> 
> > So you have to merge locally your debian/0.148 branch and the "master"
> > branch, then push the result to alioth
> > so something along
> > 
> > git checkout master
> > git merge debian/0.148
> > .... solve conflicts
> > git push
> Jordi, do you reckon I can do the merge or this would break your
> work?

No, besides the conflicts that will need to be resolved.

> > We don't need to create a branch for every upstream release IMHO, I
> > just did this for 0.146 because it was the version which is pending
> > during the Debian freeze and I wanted to allow other people to push
> > their changes in "master"
> Ok, if I get it right, the schema should be:
> master -> bleeding edge with tags on relevant commits (0.147, 0.148...)
> debian/0.xxx -> casual branches for maintenance of old version

Better:

master: version for unstable or experimental, ie, the newest upload being prepared.

wheezy: changes against 0.145 that should enter wheezy

experimental: if there's a reason to target to experimental when unstable
isn't blocked like right now due to the freeze.

etc.

We would normally want to do all our stuff in master.

-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
jordi at sindominio.net     jordi at debian.org     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/