Community
Participate
Working Groups
I20100224-2242 Here's a common workflow for which we don't have tooling support: - I get a patch from a contributor for review - I apply the patch to my workspace (and maybe add some more tweaks) - at the end of the review, I request a second patch - contributor posts an second version of the patch Now, I have to review the second patch, but I'm mainly interested in changes between the first and the second patch. There's no tooling support for this second review. I cannot apply the second patch to my workspace any more, and I also don't want to revert the changes in the workspace. The only way is to check out the affected projects a second time into my workspace, apply the second patch there, and then pairwise compare old and new projects. That's quite clumsy (and it screws PDE build state, since I have the same projects twice in my workspace). Proposal for a much better workflow: I apply the patch to the synchronize view using a new mode 'Synchronize with patch against latest from repository'. The synchronization will take: - the 'Latest from Repository' => as ancestor - the workspace contents => as 'Local File' (left side in compare editors) - the latest from repository with the patch applied => as 'Remote File (After Patch)' (right side in compare editors) With this, the second review becomes super-easy: I see a conflict for each file that has been changed in the workspace as well as in the second patch. I can use the normal conflict-resolution tools ('Copy from Right to Left' in the compare editor, 'Mark as Merged', 'Override and Update'), and if I only want to see the changes between workspace and second patch, I enable 'Two-Way Compare (Ignore Ancestor)'. Files that have only been changed in the workspace are shown as 'Outgoing' change. I can use 'Override and Update' to accept the version from the second patch, or I can copy selected changes and then mark as merged. Files that have only been changed in the second patch are shown as 'Incoming' change. I can use 'Update' to apply them to the workspace.
I totally agree this would be a great feature to have. In fact, I was hoping this would be the next step after bug 236169 is fixed. By the way, the workflow looks similar to the one from bug 198149.
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.
