Solution 1
Step 1 - 4 are the same as before done by the developer (dev). The reviewer (rev) has to do step 5 - 10. The additional steps are 7 - 9.
- dev: use tx-openissueonproject to clone the default on trialox.org (creates ISSUE-XY on trialox.org)
- dev: use tx-cloneissue to have a working copy (creates ISSUE-XY on the dev's computer)
- dev: commit and push to the issue on trialox.org
- dev: use tx-updatefromdefault
- dev: use hg diff (http://mercurial.selenic.com/wiki/RdiffExtension) from default repo with issue repo as first argument and redirect the output to a file (e.g hg diff PATH-TO/ISSUE-XY/ARTEFACT-ID > ISSUE-XY_ARTEFACT-ID.patch)
- dev: create a folder called ISSUE-XY in the folder "patches" on trialox.org
- dev: resolve issue
- rev: download patches from th issue
- rev: use tx-cloneissue to clone the default repos of the affected projects
- rev: review patches / apply patches (e.g. hg import -m "ISSUE-XY: message" ISSUE-XY.patch) and then review the issue
- rev: Push patched default to trialox.org
- rev: If reviewer fixed some typos or made some minor changes commit them separately.
- rev: remove folder ISSUE-XY from trialox.org
Solution 2
Solution 2 is more complicated to apply to the current development process
More information could be found on the following web pages:
http://mercurial.selenic.com/wiki/MqExtension
http://hgbook.red-bean.com/read/mercurial-queues-reference.html
http://hgbook.red-bean.com/read/managing-change-with-mercurial-queues.html
Labels
(None)