Interesting post.   Sounds like you want some kind of semi git-flow kind of 
thing except with long-lived minor-release extra level of integration 
branches.

I think weewx basically takes the position of "*stick where you're at or 
get yourself current*" in general, other than also pointing folks at 
individual commits they might hand-edit into place on their old sources (at 
their risk and pain) before things get released. But I would be surprised 
to ever see another 3.9.x release now that 4.0 is imminent, for example.

Can't you get the same effect by:

   - git pull (get your repo current)
   - git checkout -b v3.8.0 (create a local branch at the point in time you 
   want to start with)
   - git diff -b v3.9.2. (diff your working branch vs. some later point in 
   time) 
   - and so on...

I worked a project that used git-flow.  It was brutal.  No way to 
effectively have multiple parallel lines of code that moved forward (ie, 
patch 3.8.x when current dev was on 3.9.x or the like).  No matter what you 
do, you have the back merge problem if you want to lag current.

Seems to me that weewx's branching is a "one way....move forward..." kind 
of mindset.  While there are posts saying "get this commit" for a reported 
bug, they 'tend' to be versus the current major.minor version, not one that 
might be a year+ behind.    In your case, wouldn't you want to get to 
3.latest regardless ?




-- 
You received this message because you are subscribed to the Google Groups 
"weewx-development" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/weewx-development/a64261cd-912a-4e1a-8e3a-d6b6535b8077%40googlegroups.com.

Reply via email to