History | Log In     View a printable version of the current page.  
Issue Details (XML | Word | Printable)

Key: IDEADEV-12419
Type: Bug Bug
Status: Open Open
Priority: Normal Normal
Assignee: Dmitry Jemerov
Reporter: Stephen Friedrich
Votes: 0
Watchers: 0
Operations

If you were logged in you would be able to see more operations.
IDEA: Development

VSS: Compare with Clipboard cannot checkout

Created: 04 Dec 06 16:06   Updated: 22 Sep 07 17:49
Component/s: Diff/Merge
Fix Version/s: Diana Final

Original Estimate: Unknown Remaining Estimate: Unknown Time Spent: Unknown

Build: 6,112
Severity: Low


 Description  « Hide
I have two different versions ("branches", but in fact only copies) of the same project open.
I wanted to manually merge a change I did in one version to the other copy.
So I selected all in the file I modified in project copy A, copied to clipboard,
then switched to the same file in project B selected all again and invoked "Compare with Clipboard".

Idea showed my changes just fine. At first I wondered that there are no icons to transfer each change, but then I realized that the file wasn't already checked out.
I tried to make a dummy change (i.e. pressed enter) in the file, but nothing happened.

Note: When I "compare two files" Idea does not show the merge icons either, but as soon as I press "enter" (or make any other change) Idea asks to check out the file and as soon as the checkout is complete, it shows all the merge symbols.



 All   Comments   Work Log   Change History      Sort Order:
There are no comments yet on this issue.