Last steps to Mame 0.148

[Cesare Falco]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256


> Have a look at this:
> http://wiki.debian.org/Games/VCS/git#Creating_a_git_repository
I'll take care of it tomorrow. Please let me do it, so I can learn
how to do it. :)

> 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?

> 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

Please correct me otherwise. :)

Cheers,
Cesare.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQIcBAEBCAAGBQJRAxBJAAoJEDN0CPViG1GgeegP/2K2zEiLPrU97l9e9nlp7tLP
vrOKWiYLWpGaLHR3+/w2f0vhGMyT+5bc1tHVsVSiEXW+qhFszRGPkab7BNXnEjWg
pqftkUY3ZA8KFv96ohA9Hs6UJgrNMjANHmvI1pGMUs+/NHGQYIcdgkGnCS1EIvC2
1tc0q8C6xORh0xXL9VuVITti+gCu93fqIWIdZrgeuLD2jZ2/oFH39CBXUCpxEbfn
ODYM2y3/ORDg6o5XtYkOBbuZXNSVFBS0iah+oAbGAfVdxtSb1Dc05k6E2sGlrKSL
+NJfzTI22JB6eZwekO/VRbiZWmH1vwaqoiQiSWQNLuyBPAmqxNXTijfUIK7udmEi
R7vpDeSn3uLqjF3+7zvDlkLQI8RfRtEi1JC3uU3btKaWd2Ea0dCO3SyJRP0id4jo
GwXQ/PGOCf7S0PtM6p/oqY2oETrV3Hpot8VrdVCxEfZUp5mhInNsO+uN6FH3z8D4
dIKWxdWuRjgMm2oToBNIoqL5w9Vt+jUjtwA69B4HYxZT7BQQh7QBagIOmVQNf0hA
RHOZ032luDoAdzMSPqguq9Ofk0567xTIVVgil5b2h0E0FLypIn0PFcNKAdnYXl3j
2DmjtKJ8lWrA2Tp9D+A4VIC8tPp59/na0hvnB3DS4cjwu3wWXUxKhfCI4jXRCzKa
VhyshfjJHNQfF7/rtG4e
=bDAZ
-----END PGP SIGNATURE-----