Re: [fossil-users] advice on managing language specific branches

[Warren Young]

On Jun 28, 2017, at 1:39 AM, Luca Ferrari  wrote:
> 
> Now I have to maintain the same application on two different language
> versions, php 5 and 7. I created a LANG_5 and LANG_7 branch and work
> as usual.
> But what about common branches? Let's say I develop a  common feature
> that could run on both, at the time I merge into both the above, but
> I'm pretty sure there's a smarter way.

The “common branch” is called “trunk”.

I don’t mean to be glib: I am suggesting that you drop your LANG_7 branch and 
develop everything on trunk for the latest version of PHP you are supporting, 
then conditionally backport changes to the LANG_5 branch where that’s 
appropriate.

I would actually name the LANG_5 branch after your application’s version 
numbering scheme, not after the associated PHP version.

For example, if your system was developed to its version 3.x under PHP 5, then 
you started developing v4.0 of your system for PHP 7 and up, I’d create a “v3” 
major branch just prior to the point where the trunk started to contain v4+ 
features.  v4 is then developed on the trunk, with backports to the v3 major 
branch at need.

When you start work on v5, you create a v4 branch and continue as before, even 
if you don’t change PHP versions.

The point is that branches and version numbers in Fossil should refer to your 
system, not to the versions of the software stack it is based on.  You should 
be able to rewrite your whole app in another language and still keep the same 
version numbering scheme.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] advice on managing language specific branches

[Luca Ferrari]

Hi all,
this could sound trivial, but so far I developed on the same language
versione (e.g., php 5) and all my branches were feature branches.
So far so good.
Now I have to maintain the same application on two different language
versions, php 5 and 7. I created a LANG_5 and LANG_7 branch and work
as usual.
But what about common branches? Let's say I develop a  common feature
that could run on both, at the time I merge into both the above, but
I'm pretty sure there's a smarter way.
Any advice?

Thanks,
Luca
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users