On Apr 22, 2016, at 10:35 PM, Ron W <ronw.m...@gmail.com> wrote: > > At work, my team keeps autosync on. We do all our code changes in branches. > Our workflow is: > 1. An issue ticket is created, describing either a problem or a specification. > 2. (wait until issue is reviewed and approved) > 3. A branch is created for that issue. > 4. Make code changes, perform tests, committing as appropriate. (see note #1) > 5. When done and all tests passed, change issue state to "In_Review". > 6. Review proposed code. > a. If rejected, revert issue to either "InDev" or "OnHold". Go back to #4 > b. If approved, set issue to "Integrating" > 7. Merge final commit of issue branch to trunk and test. > a. If tests pass, set issue to "Integrated" > b. If tests fail, set issue to "InDev". Go back to #4 > 8. When a "validation release" is made, set integrated issues to > "InValidation". >
Nice work flow… In the above workflow, here are my questions: 1 - step#4 is fine because dev is working on a branch. do you have any mechanisms in place to prevent them from accidentally committing a file on the trunk instead of the branch at this stage of the workflow? 2 - step #8 should have the final commit I guess, because #7 merge only merges into the checkout workspace to do final integration test. Overall I like this workflow, but I would like to make sure they can’t accidentally push stuff from one repo to the other that they may have committed to their own own repo, perhaps from a different workspace or by accident to the trunk instead of the feature branch. Since push and pull always transfer the entire repo with all versions that are there…if they updated their local repo’s trunk in any way whatsoever, perhaps totally unrelated to the ticket…it could slip through the cracks and be pushed to the central server repo without any code review or notice. What am I missing? How can that situation be caught or prevented? _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
