Bug 250140 - Backport [usability] Save conflict dialog appears when saving files in the editor
Summary: Backport [usability] Save conflict dialog appears when saving files in the ed...
Status: RESOLVED FIXED
Alias: None
Product: Target Management
Classification: Tools
Component: RSE (show other bugs)
Version: 3.0.1   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 3.0.2   Edit
Assignee: David McKnight CLA
QA Contact: Martin Oberhuber CLA
URL:
Whiteboard:
Keywords:
Depends on: 249544
Blocks:
  Show dependency tree
 
Reported: 2008-10-08 13:39 EDT by David McKnight CLA
Modified: 2008-12-04 14:14 EST (History)
1 user (show)

See Also:
kjdoyle: review+


Attachments
patch for waiting for final timestamp (10.54 KB, patch)
2008-10-08 17:22 EDT, David McKnight CLA
no flags Details | Diff
updated patch to deal with compatibility issues with old IBM dstore server (10.09 KB, patch)
2008-10-10 10:18 EDT, David McKnight CLA
no flags Details | Diff
updated patch to deal with compat issues with old IBM dstore server (13.54 KB, patch)
2008-10-10 10:19 EDT, David McKnight CLA
no flags Details | Diff
updated patch to ensure original timestamp is the original (13.69 KB, patch)
2008-10-17 10:37 EDT, David McKnight CLA
no flags Details | Diff
another update to let the wait method timeout (14.47 KB, patch)
2008-10-17 10:53 EDT, David McKnight CLA
no flags Details | Diff
another update to also check that monitor isn't cancelled (14.53 KB, patch)
2008-10-17 11:36 EDT, David McKnight CLA
no flags Details | Diff
patch dealing with remote file cache (10.83 KB, patch)
2008-10-21 09:41 EDT, David McKnight CLA
no flags Details | Diff
updated patch (11.37 KB, patch)
2008-11-07 12:20 EST, David McKnight CLA
no flags Details | Diff
update to the SystemUploadConflictAction.BackgroundSaveAsJob (3.21 KB, patch)
2008-11-07 16:41 EST, David McKnight CLA
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David McKnight CLA 2008-10-08 13:39:43 EDT
This bug has been created for the backport of the fix for bug 249544 to go into
the TM 3.0.2 release.
Comment 1 David McKnight CLA 2008-10-08 17:22:41 EDT
Created attachment 114607 [details]
patch for waiting for final timestamp

This patch is a straight back-port from what we have in HEAD.
Comment 2 David McKnight CLA 2008-10-10 10:18:16 EDT
Created attachment 114795 [details]
updated patch to deal with compatibility issues with old IBM dstore server
Comment 3 David McKnight CLA 2008-10-10 10:19:45 EDT
Created attachment 114796 [details]
updated patch to deal with compat issues with old IBM dstore server
Comment 4 David McKnight CLA 2008-10-17 10:37:58 EDT
Created attachment 115398 [details]
updated patch to ensure original timestamp is the original
Comment 5 David McKnight CLA 2008-10-17 10:53:20 EDT
Created attachment 115401 [details]
another update to let the wait method timeout
Comment 6 David McKnight CLA 2008-10-17 11:36:45 EDT
Created attachment 115408 [details]
another update to also check that monitor isn't cancelled
Comment 7 David McKnight CLA 2008-10-21 09:41:24 EDT
Created attachment 115693 [details]
patch dealing with remote file cache
Comment 8 David McKnight CLA 2008-11-07 12:20:44 EST
Created attachment 117341 [details]
updated patch

Here's the updated backport patch.
Comment 9 Kevin Doyle CLA 2008-11-07 16:32:53 EST
SystemUploadConflictAction.BackgroundSaveasJob.run()  

We do:

// copy temp file to remote system
                    fs.upload(_tempFile.getLocation().makeAbsolute().toOSString(), _remoteFile, SystemEncodingUtil.ENCODING_UTF_8, monitor);


why was this changed to _remoteFile instead of _saveasFile?

Otherwise code review seems okay.  Need to test it out after hearing about above.
Comment 10 David McKnight CLA 2008-11-07 16:41:51 EST
Created attachment 117370 [details]
update to the SystemUploadConflictAction.BackgroundSaveAsJob

Adding this patch to ammend SystemUploadConflictAction.BackgroundSaveAsJob since we shouldn't be passing in _remoteFile (it should be _saveAsFile).
Comment 11 Kevin Doyle CLA 2008-11-10 12:41:48 EST
Review +.
Comment 12 David McKnight CLA 2008-11-10 14:18:49 EST
I've committed the changes to cvs.
Comment 13 David McKnight CLA 2008-12-04 14:14:49 EST
(In reply to comment #12)
> I've committed the changes to cvs.
> 

updated to match the HEAD.