Bugzilla – Full Text Bug Listing
| Summary: | [patch] Warn when editing a file that is already part of a different change set | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | z_Archived | Reporter: | Sam Davis <sam.davis> | ||||||
| Component: | Mylyn | Assignee: | Sam Davis <sam.davis> | ||||||
| Status: | CLOSED MOVED | QA Contact: | |||||||
| Severity: | enhancement | ||||||||
| Priority: | P3 | CC: | shawn.minto, steffen.pingel | ||||||
| Version: | unspecified | ||||||||
| Target Milestone: | --- | ||||||||
| Hardware: | PC | ||||||||
| OS: | Windows 7 | ||||||||
| Whiteboard: | |||||||||
| Attachments: |
|
||||||||
|
Description
Sam Davis
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).
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. This is related to bug 162007. I'll tentatively schedule this for 3.6 to consider the patch. 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. 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. 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.
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? 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. 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. 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 |