Community
Participate
Working Groups
20060512 I don't have Compare With or Replace With Local History Actions on the popup menu for any resource. I do have the "Replace With Previous from Local History" action. I'm fairly certain that I created this workspace with 3.2 RC2 and the same actions were missing then. Not sure if they were ever there. When I create a fresh workspace I do have all local history actions. Is there any way to get these back without creating a new workspace?
Is this particular to your current workspace? (i.e. do new/other workspaces show these menu items?)
Using I20060512-0010. I have Compare With > History and Replace With > History actions. Not sure if the convenient action Replace with Previous from Local History was intentionally removed or not. Moving to Team component for comment.
re: comment #1, yes a new workspace has all local history actions. re: comment #2, Compare/Replace With History is different. Those are the team actions. The ones missing for me in this particular workspace are the *local* history actions. BTW: the timestamp of the Eclipse build I'm using now is 1600
We've changed the History view to try to make it more of a one-stop-shop for all of your history needs. You can now view the local, local + remote or just remote revisions for any CVS managed file in the history view (although we also provide a history page for unmanaged files). You can compare, replace, open revisions, annotate and tag directly from the history view.
I see the new merged local/team history dialog. I have an unmanaged file with changes. The "History" menu item is disabled. In a different workspace I have a "Local History" menu item for an unmanaged file. Is the menu item different for a managed vs. unmanaged file?
If the project that your unmanaged file resides in is managed by CVS, (ie. new file but haven't comitted it yet), then you should still see "Show History" in the Team menu (along with Compare With>History, Replace With>History). On the other hand, if your entire project is unmanaged, then you will see "Show Local History" in the Team menu.
The reason why the History menu item was disabled for this file is that it is in the .cvsignore file. The file in question is build.xml and .cvsignore includes a line *.xml. Removing that entry enables the menu item. Whether or not a file is excluded from CVS should not affect accessibility of the local history. I'll open a separate bug for the disparate menu item labels depending on whether a project is managed or unmanaged.
Thanks for the investigative leg work Knut. Marking this as a great bug and will attach a patch with a fix.
Created attachment 41893 [details] patch Here is a patch that enables the Show History menu item for resources that have been added to version control and resources that are on the .cvsignore list. This patch is very safe as it just returns true for the above mentioned cases. (We were already doing this for unmanaged files but we just missed these two cases).
McQ, Dejan, Silenio, Michael, do you approve this fix for RC5? The fix is very safe and it addresses a regression. In 3.2, we have rolled Local History and History actions together for CVS managed resources. Without this patch, users will not be able to get at Local History items for resources that have been marked as ignore or resources that have been added to version control but not committed yet.
+1
Adding Wassim to CC list for approval.
Patch released to HEAD
Verified in I20060519-1206
