Bug 13893 - [CVS UI] When I choose Replace with revision I get a compare editor
Summary: [CVS UI] When I choose Replace with revision I get a compare editor
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: PC Windows NT
: P3 normal (vote)
Target Milestone: 3.0 M8   Edit
Assignee: Jean-Michel Lemieux CLA
QA Contact:
URL:
Whiteboard:
Keywords: usability
Depends on:
Blocks:
 
Reported: 2002-04-16 11:05 EDT by Dani Megert CLA
Modified: 2004-03-15 12:36 EST (History)
2 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Dani Megert CLA 2002-04-16 11:05:40 EDT
There are several issues using the compare editor to get a revision:
1) Confusion when getting something different than chosen
2) I always have to wait until the files are compared until I can choose a revsion
3) I can't double-click on a revision to get it
4) Editor always stays after choosing my revision - I have to manually close it
Comment 1 Jean-Michel Lemieux CLA 2002-04-16 23:19:20 EDT
I use the resource history view for this workflow.
Comment 2 Jean-Michel Lemieux CLA 2002-04-16 23:29:48 EDT
Actually I have to agree that our use of an editor for the replace with revision
is weird.
1. why does replace with history show the compare in a dialog but replace with
revision shows in editor?
2. there are probably valid use-cases for both options though: editor allows you
to  replace, test or edit some code, then replace again without having to hit
the server again. The problem with this workflow is that the editor doesn't
update with changes made to the resource outside of the compare editor. 
3. if it remains an editor, there should be a shortcut for "replace with this
and close", or else there are way too many mouse clicks required.

Comment 3 Kevin McGuire CLA 2002-04-17 13:34:50 EDT
post 2.0 to clean this up, we meant to but never found the cycles
Comment 4 Michael Valenta CLA 2002-09-09 16:06:21 EDT
Reopening
Comment 5 Joerg Pleumann CLA 2003-05-08 05:12:03 EDT
I stumbled across this, too (2.1). Actually I was about to enter a bug report,
because i didn't really understand that this *was* the replace dialog and that I
should use the context menu to replace the file. I suggest that at least the
title bar be changed.
Comment 6 Carolyn MacLeod CLA 2003-10-14 14:53:21 EDT
I also found the "get an editor when you expect a dialog" workflow non-
intuitive for Replace With->Revision...

I needed to release a previous revision of a class, so I know I have to load 
the previous revision into my workspace, and then synchronize to release.
(There is probably a better or newer way to do this, but I am old, and I tried 
to do it the old way. I don't see how to do it from the resource history view).

When the editor opened instead of the dialog I actually thought a bug had been 
introduced <g>. I tried to keep working anyhow, but popping up the context 
menu on the revision yielded "Get Contents" or "Get Sticky Revision" - neither 
of which sounded quite right. I tried "Get Contents", and saw that my class 
was marked as changed. I guess that's ok, but I would have expected the 
revision to be loaded into my workspace - I could have seen this from the 
label decorations. (At first, I didn't have the cvs label decorations turned 
on, so it seemed that nothing had happened. I thought perhaps the asterisk in 
the Revision column of the Structure Compare table would move to the other 
revision, but it didn't).

To make matters even more confusing, I kept getting a cryptic "The file has 
been changed on the file system. Do you want to load the changes? yes/no" 
dialog. I had no idea whether I wanted "yes" or "no". I can't reliably 
replicate this, but it has something to do with opening several comparison 
editors by saying Replace With->Revision... again, and selecting "Get 
Contents" in one editor and closing another - or something like that.

The bottom line is that while I did eventually release the old code (as a new 
revision - not exactly what I intended, but good enough), I kept feeling that 
I was getting further and further away from what I really wanted to do, which 
was simply to load-and-release the old revision. Can we make this process more 
streamlined? The Replace With->Local History... workflow is more intuitive. It 
is unfortunate that these two similar workflows are inconsistent.
Comment 7 Jean-Michel Lemieux CLA 2004-03-04 00:33:11 EST
I stumbled upon this and realized that I was already planning on addressing the
editor/dialog/view usages in the CVS plug-in. This will make it into M8.
Comment 8 Jean-Michel Lemieux CLA 2004-03-09 21:40:10 EST
Fix released to HEAD as follows:
- tried to harmonize our use of editors and views. there are cases when having a
non modal compare/merge is useful, but for the most part you don't need it.
- merge/compare with/replace with now will always show a dialog.
- the replace with dialog has a replace button to replace with the current
selected revision
- compares and merges can be 'remembered' an made non-modal. the synchronize
view can contain different participants for compare and merges. this is an
option on the dialogs.
- i didn't add the double click a revision to replace because that's already
used to fetch the remote revision, instead just use the replace button. 
- we don't fetch file contents for the revisions until selected, this is to
avoid a round-trip when opening the dialog.
Comment 9 Michael Valenta CLA 2004-03-15 12:36:53 EST
Verified (bug 54854 has been entered for refinements)