Re: [Health-dev] New mercurial development branch and workflow

[Feng Shu]

Luis Falcon <falcon@gnuhealth.org> writes:

> Dear devs
>
> We have a new development branch called "future" that will hold the
> upcoming stable releases.
>
> This applies to hmis server and client repositories. The current
> branches are:
>
> * stable: current stable releases

(1) I have sync tag 4.4.0 to stable branch by merge other approach.

changeset 6755:04251e8137bb (Very very big commit)

Step:

1. hg update stable
2. hg merge 4.4.0 --tool=internal:other
3. hg commit -m "Merge tag 4.4.0 to stable branch with mergetool: 
internal:other"
4. rm tryton
5. cp ../health-4.4.0/tryton ./  (copy tryton directory from 4.4.0)
6. hg commit --amend

Result:

hg diff --from=4.4.0 --to=<this commit>  == None



(2) Then I merge and graft the below commits from default branch to stable 
branch:

1. health_surgery: fix grade3b typo
2. gnuhealth-control: Update pip packages
3. merge commit: Added tag 4.4.0 for changeset fceba6ac2683stable


(3) After that, I merge stable to default:

 https://hg.savannah.gnu.org/hgweb/health/rev/8f43f72c6f9b



The three steps seem no error :-)



> * default: testing functionality and patches for stable releases  
> * future: new features for upcoming release 
>
> Although the duet stable/default works, it's a bit more involved in
> major refactoring work.
>
>
> Please keep it in mind when developing. So, if we find a bug for the
> current 4.4 release, we'll fix it and test it on "default" and then
> merge it on "stable".
>
> The tasks for the upcoming 5.0, we'll be worked on branch "future".
>
> As per tagging particular changesets releases, functionality remains
> happy as it is today :)
>
> All the best
> Luis

--