Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 342767 - [patch] Warn when editing a file that is already part of a different change set
Summary: [patch] Warn when editing a file that is already part of a different change set
Status: CLOSED MOVED
Alias: None
Product: z_Archived
Classification: Eclipse Foundation
Component: Mylyn (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Sam Davis CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-13 16:53 EDT by Sam Davis CLA
Modified: 2011-07-20 19:55 EDT (History)
2 users (show)

See Also:


Attachments
patch (13.06 KB, text/plain)
2011-04-13 16:55 EDT, Sam Davis CLA
no flags Details
warning with checkbox (5.07 KB, image/png)
2011-05-06 13:01 EDT, Sam Davis CLA
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Sam Davis CLA 2011-04-13 16:53:22 EDT
We should warn the user when they start editing a file that is already part of a different change set. That way they would have the opportunity to commit or roll back the changes for the first change set, before getting themselves into a bad state.
Comment 1 Sam Davis CLA 2011-04-13 16:55:30 EDT
Created attachment 193197 [details]
patch

This displays a task list notification when first editing a file that is already part of a different change set (i.e. not the change set of the active task).
Comment 2 Sam Davis CLA 2011-04-13 17:02:54 EDT
This should not be very disruptive since it doesn't display a modal dialog - you can just keep typing and ignore it. There is no automatic way to resolve the conflict - the user has to decide whether to commit the changes from the other changeset, revert them, or proceed with editing the file with the intention to commit both change sets together.

We should consider having an option to not display these notifications, although I think that if you are seeing them often enough to be bothered by them, you are doing something you should not be.
Comment 3 Steffen Pingel CLA 2011-04-13 17:04:29 EDT
This is related to bug 162007. I'll tentatively schedule this for 3.6 to consider the patch.
Comment 4 Shawn Minto CLA 2011-05-02 13:59:28 EDT
I have this patch applied and it seems to work really nicely.  I am still a bit unsure of how the notification works since it goes away quickly, but I think that we should try to get this in for 3.6.
Comment 5 Sam Davis CLA 2011-05-02 14:22:07 EDT
Perhaps we could consider customizing the notification to standout from the normal task list notifications. For example, it could show at the opposite side of the screen.
Comment 6 Sam Davis CLA 2011-05-06 13:01:01 EDT
Created attachment 194962 [details]
warning with checkbox

Lately I often have to make quick edits to files in a different change set for testing. Maybe the popup should have a checkbox to disable warnings for the changeset that the edited file belongs to.
Comment 7 Shawn Minto CLA 2011-05-06 13:59:11 EDT
Yeah, this could work and makes sense as a "dont show me this again" we would need to have a way to toggle this back in the preferences too.  Steffen, what are your thoughts here?
Comment 8 Steffen Pingel CLA 2011-05-07 19:54:08 EDT
Sounds like a good idea to be able to dismiss the popup for a particular change set. This is similar to suppressing notifications for a particular synchronization by closing the popup once.
Comment 9 Sam Davis CLA 2011-07-20 19:55:39 EDT
Minor bug: with this patch, it is possible to see the warning when deactivating a task which has a file open with unsaved changes. I've only seen this once.
Comment 10 Eclipse Webmaster CLA 2022-11-15 11:45:08 EST
Mylyn has been restructured, and our issue tracking has moved to GitHub [1].

We are closing ~14K Bugzilla issues to give the new team a fresh start. If you feel that this issue is still relevant, please create a new one on GitHub.

[1] https://github.com/orgs/eclipse-mylyn