[syslog-ng] git repository reorganization

[Gergely Nagy]

Balazs Scheidler <bazsi at balabit.hu> writes:

> Since git is perfectly capable of storing multiple major releases in the
> same git repository, I think it would be the best to let the multiple
> repositories idea go and stick to a single repository model in the
> future.

YAY! This will make my work a lot easier, thank you!

> Branch names would be as follows:
>   - master: the latest HEAD where development is happening on the latest
>     release
>
>   - 3.3/master, 3.4/master, 3.5/master: the HEAD for maintained old
>     major releases
>
>   - topic branches destined for a specific major release would be named
>     3.X/<branch>, topic branches for the latest version would omit the
>     version number prefix.

Can I suggest we use 3.x/f/<foo> or 3.x/h/<foo> for branch names, and
f/<foo> or h/<foo> for master? The f/ thing for features and bigger
changes, h/ for hotfixes, just to make it a little bit more clear.
Personal preference mostly, but I thought I'd bring it up.

>   - tags indicate releases, they are named after the respective release
>     for example: v3.4.5

Again, this is mostly personal preference, but would it make sense to
switch tagging to syslog-ng-3.4.5 instead of v3.4.5? The benefits are
that the tarballs github makes will have nicer names this way
(syslog-ng-$VERSION.tar.gz instead of v$VERSION.tar.gz), and also makes
it easier for me to see on my prompt where I am, when I'm knee-deep in
submodules. But mostly the nicer tarball name...

-- 
|8]