1. Mercurial workflow
- Posted by jaygade May 31, 2013
- 1132 views
The Euphoria Mercurial page is very helpful, but I just want to verify before I screw up the repository.
I cloned the main repository into my gold copy. Then I checked out a 4.0 branch. I edited a file. Then I pushed that file into my gold copy. So now I can push my gold copy back to the main repository.
But my changes should apply to the default branch as well. Does that happen automagically, or do I need to edit the default branch as well? How do I make sure it trickles up?
Thanks.
2. Re: Mercurial workflow
- Posted by ne1uno May 31, 2013
- 1128 views
I cloned the main repository into my gold copy. Then I checked out a 4.0 branch. I edited a file. Then I pushed that file into my gold copy. So now I can push my gold copy back to the main repository.
But my changes should apply to the default branch as well. Does that happen automagically, or do I need to edit the default branch as well? How do I make sure it trickles up?
Matt usually merges changes up to default and structs.
merging seems less error prone than manually editing both 4.0 and default 4.1, remembering to add everything, the changelog, doc changes, the ticket #tag in the commit, whatever else. merging still feels a bit dangerous to me as I haven't that much experience with it. I would just fix it in the one branch.
testing on all OS, (windows) sometimes lags a little. for non breaking changes should be no problems.
