[#IDEADEV-16250] Diff on shelved change: "Your version" is empty if patch cannot be applied

IDEA: Development

Diff on shelved change: "Your version" is empty if patch cannot be applied

Created: 13 Apr 07 12:14 Updated: 06 Nov 08 23:15

Component/s:

Version Control Integration. VSS

Fix Version/s:

Undefined

Original Estimate:

Unknown

Remaining Estimate:

Unknown

Time Spent:

Unknown

Build:	6,819
Severity:	Medium

Description

« Hide

I shelved a change of a single file.
Somebody else modified the source in VSS.
Trying to unshelve shows an error dialog
"Failed to apply patch for file ... Context mismatch. Expected line..."
Fine so far.

Bug:
When I try to view the diff (invoke "Show Diff" on context menu on the shelved change) Idea shows the Diff window with the "Your version" part completely empty.
It should give a similar error message.

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Stephen Friedrich - 13 Apr 07 14:07

Hm, on second thought the error "Context mismatch" should never occur:
Can't you just reconstruct the actual changes by applying the stored patch file against the preceding version in VCS (the one that I originally checked out and edited).

Having that result you can freely diff against the local version or against the latest version in VCS.

[ Permlink | « Hide ]

Dmitry Jemerov - 17 Apr 07 13:36

VssVcs needs to implement AbstractVcs.parseRevisionNumber() in order for loading the preceding version to work.

[ Permlink | « Hide ]

Dmitry Jemerov - 17 Apr 07 13:37

A related issue (for error handling) is http://jetbrains.net/jira/browse/IDEADEV-12947

[ Permlink | « Hide ]

Michael Gerasimov - 24 May 07 12:53

Actually, problem is in the getting the proper Version Number of the currently available version of the file. To do that, I need to issue one more ss.exe command like "ss.exe history -B -#1 <file>" and parse the current version number. Thus it is theoretically possible but is not a cheap step.