From: Lieven H. <li...@li...> - 2013-03-19 07:45:56
|
Hi Kevin, On Tue, Mar 19, 2013 at 12:45 AM, Kevin Robert Keegan <ke...@kr...>wrote: > Here are my thoughts on the issue. > > Robert raises a good point, we are not able to distinguish between > different versions of master. For example, a user who pulled a copy of > master from 14 days ago may ask for help believing that he has a recent > copy of mh. But if he is using Insteon, a lot of the code may have > changed in that time. Hopefully we would all realize the problem, but you > never know. > > Hold your horses :-) A user pulled a copy of master. That is one good informed user then. Maybe it was not clearly enough communicated by my, but if as a user (or developer alike) do a git clone git://github.com/hollie/misterhouse.git Then you get by default the latest stable release. If you want master you need to specifically do git checkout master. >From that point on you're no longer a regular user but a developer. No? > I see two solutions: > > 1. Request that users pull fresh copies of master, but this is not always > ideal. > > 2. Add a date so the version number is listed as "unstable - DD/MM/YYYY." > If there was a way to automatically do this, that would be awesome, > otherwise doing this manually will likely slow merges into master as it > will no longer be a simple click of a mouse. As for a changelog, I don't > know that we need an explicit one in unstable/master. I am comfortable > forcing users of unstable/master to review the commit logs. > > Third option: we let MisterHouse check if we're running unstable, then we check if we have a .git folder, and if we have we do a 'git fetch and git status' and parse the output. You will get a statement like 'your branch is xx commits behind origin/master' and we add that to the version line (which would then end up like 'unstable 5 commits behind origin/master'). Best regards, Lieven. |