Re: [ANNOUNCE] libchamplain 0.12.4

["Zeeshan Ali (Khattak)" <zeeshanak gnome org>]

On Fri, May 31, 2013 at 4:42 PM, Jiří Techet <techet gmail com> wrote:
> On Mon, May 27, 2013 at 4:55 PM, Zeeshan Ali (Khattak)
> <zeeshanak gnome org> wrote:
> > On Thu, May 16, 2013 at 9:28 PM, Jiří Techet <techet gmail com> wrote:
> > > Hi!
> >
> > Hi Jiri,
> >
> > I'm still a bit confused about the release tags and branches. While
> > there is a separate 0.12 branch, master branch's configure also claims
> > to be 0.12.x. Looking at the branches, its not very clear to me if
> > master and 0.12 are really different and if they are, what the
> > difference is.
>
> Hi Zeeshan,
>
> they are the same. Point releases have always been made from the
> branch so I merged the changes from master into the branch. I normally
> do the development on master and merge it into the branch but could be
> doing it vice versa too. Basically all the development made in the
> last release is backwards-compatible and there was no extra work done
> in master so the two are the same.

Ah ok. I think the history is messed-up then. When branch and master
are the same, their history should appear as one, otherwise it will
not be clear to anyone other than you what is going on. E.g release
tags should appear also in master's history and not just the branch.

To keep the history sane I strongly suggest not to maintain a branch
if its going to be merged into master in a near future. For
work-in-progress branches I suggest what most projects do:

$ git branch wip/new-cool-stuff
$ git checkout wip/new-cool-stuff
... Do your cool stuff
$ git push origin wip/new-cool-stuff # To keep your changes backed-up
.. Continue your cool stuff till its ready for merge
$ git remote update && git rebase origin/master && git rebase master
wip/new-cool-stuff
$ git merge wip/new-cool-stuff
$ git tag TAG
$ git push origin master TAG

--
Regards,

Zeeshan Ali (Khattak)
FSF member#5124