Bug 298923

Comment 1 Tomasz Zarna 2010-01-12 10:02:34 EST

Created attachment 155863 [details]
ongoing work in o.e.compare

Comment 2 Tomasz Zarna 2010-01-12 10:02:51 EST

Created attachment 155865 [details]
mylyn/context/zip

Comment 3 Tomasz Zarna 2010-01-12 10:05:08 EST

Created attachment 155866 [details]
ongoing work in o.e.team.ui

Patches that fix following issues from comment 0:
* 'Patch Contents' model provider should not appear in CVS synchronizations
*  CCE when switched to 'Patch Contents' model if the Sync view opened with a different model displayed initially (e.g. Java Workspace)
and (from the wiki):
* 'Patch Contents' model provider interfere unrelated Team operations (e.g. 'Replace with Another Branch or Version')

Comment 4 Tomasz Zarna 2010-01-12 10:38:05 EST

Both patches have been applied to "branch_20091215_bug236169" branch.

Comment 5 Tomasz Zarna 2010-01-14 05:15:41 EST

Created attachment 156075 [details]
ongoing work in o.e.team.ui

Patch fixes:
* Applying a change should remove it from the sync view ? change state to 'in sync'

Comment 6 Tomasz Zarna 2010-01-14 06:50:38 EST

Created attachment 156083 [details]
ongoing work in o.e.team.ui

Comment 7 Tomasz Zarna 2010-01-14 06:55:53 EST

Marking "in sync" didn't work for deletions, this has been fixed by the patch from comment 6. Both patches have been applied to "branch_20091215_bug236169" branch.

Comment 8 Tomasz Zarna 2010-01-15 09:53:57 EST

Created attachment 156229 [details]
ongoing work in o.e.team.ui

Patch for:
*  Provide a proper icon for the participant
* Provide valid description for the participant
* Missing 'incoming change' indicator for model provider different than 'Patch'
* Other models do not indicate any conflicts when applying a patch -> unmatched hunks should be treated as sync view conflicts

and others which have been fixed so fast they didn't have chance to be listed on the wiki ;)

Comment 9 Tomasz Zarna 2010-01-15 12:02:59 EST

Status update. These issue listed in comment 0 still need to be fixed:
* Make sure non-workspace patches can be applied via Sync view as well
* all issues from the Context menu section[1]:
** 'Apply' should work for projects, files and individual hunks
** 'Apply' should be disabled for unmatched hunks
** Add 'Open'/'Open With' actions
** No 'Exclude' action available, replaced with 'Remove from the view'
** 'Mark as Merged' does the same thing as 'Exclude' in the Apply Patch world (?) See 'Remove from View'.
** 'Apply' made on a hunk should affect only the selected hunk not the whole file as it happens now 
* Indicate when a project from the patch doesn't exist in the workspace

Other issues (from the wiki[2]) which imo need to be fixed before merging:
* Patches from multiple synchronizations (when pinned) should be applicable in any order. This includes applying only part of a patch.
* Response to workspace changes, reapply all hunks for a file when needed using the patch options already set
* Re-applying patch -> synchronize again
* All Compare Editor issues[3]

[1] http://wiki.eclipse.org/Apply_patch_in_Sync_view#Context_menu
[2] http://wiki.eclipse.org/Apply_patch_in_Sync_view
[3] http://wiki.eclipse.org/Apply_patch_in_Sync_view#Compare_Editor

Comment 10 Tomasz Zarna 2010-01-18 06:38:39 EST

Created attachment 156372 [details]
ongoing work in o.e.team.ui

Applying non-workspace patches.

Comment 11 Tomasz Zarna 2010-01-18 06:40:15 EST

(In reply to comment #10)
> Created an attachment (id=156372)
> Applying non-workspace patches.

In the branch.

Comment 12 Tomasz Zarna 2010-01-19 06:56:22 EST

Created attachment 156490 [details]
ongoing work in o.e.team.ui

Code cleanup and disabling 'Apply' action for hunks.

Comment 13 Tomasz Zarna 2010-01-19 07:15:39 EST

(In reply to comment #12)
> Created an attachment (id=156490)
> Code cleanup and disabling 'Apply' action for hunks.

In the branch.

Comment 14 Tomasz Zarna 2010-01-19 07:25:35 EST

Created attachment 156493 [details]
ongoing work in o.e.team.ui

Code cleanup, removed sysouts etc.

Comment 15 Tomasz Zarna 2010-01-19 07:25:57 EST

(In reply to comment #14)
> Created an attachment (id=156493)
> Code cleanup, removed sysouts etc.

In the branch.

Comment 16 Tomasz Zarna 2010-01-19 13:05:45 EST

Created attachment 156536 [details]
ongoing work in o.e.compare and o.e.team.ui

First attempt to reapply when a resource changes.

Comment 17 Tomasz Zarna 2010-01-19 13:06:52 EST

(In reply to comment #16)
> Created an attachment (id=156536)
> First attempt to reapply when a resource changes.

In the branches.

Comment 18 Tomasz Zarna 2010-01-20 11:22:03 EST

Instead of updating the status each time an issue listed in previous comments gets fixed I will open a separate bug for each of them we think need to be addressed to mark this bug as FIXED. They will all be set as blockers to this bug or directly to bug 236169 if we decided that we can proceed with the merge and fix it in HEAD.

Comment 19 Tomasz Zarna 2010-01-26 06:29:34 EST

Created attachment 157236 [details]
All changes v01

All changes from the dev branch in one patch.

Comment 20 Tomasz Zarna 2010-01-26 07:51:01 EST

(In reply to comment #19)
> All changes v01
> 
> All changes from the dev branch in one patch.

In HEAD, available in builds >=I20100126-0800.