16 Sep
2015
16 Sep
'15
10:48 a.m.
Divergence is normal but releases must be always based on develop and it
must not have new developments. This is not the case right now. You can
see it on the branch graph of github. Actually in some things release is
even behind develop (it contains new features). What I'm saying and what
I try to specify in this wiki page [1] is that we must follow a single
path in general.
So, right now, the picking must be from release 15.09 to develop. We
have to go commit-by-commit in release to see if it must be applied to
develop. And all new developments from now on must go to develop or in a
branch based on develop which will be merged in the future.
If you don't agree with this method, propose another one please.
Cheers.
[1] http://libre-mesh.org/projects/libre-mesh/wiki/repo
On 16/09/15 11:46, Gio wrote:
On Wednesday, September 16, 2015 10:56:19 AM Pau
wrote:
--
./p4u
Develop has been maintained by some developers
and the releases by
others. So in principle the differences were small and a clean merge was
possible but now it is not the case. So in some moment we should make
the effort to merge both branches and solve the conflicts (files which
have been modified in a different way).
Although i don't see as a problem some divergence between development branch
and release branch (we use a branch and not a tag exactly for this purpose), I
agree with you that we should in general avoid to do too much work on release
branch, I mean it's not a problem for this time, and I believe we should not
try to merge the release branch into develop, we can just cherry pitch what we
feel appropriated.
What we can try to do is that for future releases we try to avoid what
happened for this one ;)
_______________________________________________
Dev mailing list
Dev(a)lists.libre-mesh.org
https://lists.libre-mesh.org/mailman/listinfo/dev