[#IDEA-13590] Error when there is already a newer version of a checked out file - JetBrains JIRA

Issue Details (XML | Word | Printable)

Key:	IDEA-13590
Type:	Bug
Status:	Open
Assignee:	Michael Gerasimov
Reporter:	Wim Deblauwe
Votes:	4
Watchers:	3

Operations

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

IDEA: Feedback

Error when there is already a newer version of a checked out file

Created: 05 Jul 07 13:47 Updated: 12 Nov 07 14:55

Component/s:

Version Control Integration. ClearCase

Environment:

Window XP, ClearCase LT

Build:	6,833
Severity:	High

Description

Steps to reproduce:

1) Check out a file unreserved and edit it
2) On a different computer, also check out the file (reserved or unreserved) and edit it
3) Check in the file on the different computer
4) Try to check in on the first computer, you get an error. Normally in clearcase, a merge of the file happens in that case.

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Gilles Philippart - 15 Oct 07 14:00

I would really like to see this one adressed before final 7.0 ...

Gilles

[ Permlink | « Hide ]

Michael Gerasimov - 15 Oct 07 14:05

Does that mean that you just want CC's merge to be started over this file?

[ Permlink | « Hide ]

Gilles Philippart - 15 Oct 07 14:21

Hello michael,

When i commit a change list, many files may need to be merged, so ideally i would like to have a dialog showing :

the name and base version of the file checked out in view
the version i want to merge from
option to launch clearcase "3-way merge window"
option to launch IntelliJ diff window

buttons : ok, ok for all, skip, skip all

[ Permlink | « Hide ]

Gilles Philippart - 12 Nov 07 12:15

Michael,

Will this JIRA be adressed in some 7.0.x ?

[ Permlink | « Hide ]

Michael Gerasimov - 12 Nov 07 14:55

I think of this right now...