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

Key: IDEADEV-9976
Type: Bug Bug
Status: Resolved Resolved
Resolution: Fixed
Priority: Blocker Blocker
Assignee: Michael Gerasimov
Reporter: Irina Petrovskaya
Votes: 0
Watchers: 0
Operations

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

StarTeam: if the file has conflicting changes (both local and remote) it cannot be processed

Created: 22 Sep 06 13:14   Updated: 30 Oct 06 15:07
Component/s: Version Control Integration. StarTeam
Fix Version/s: Demetra 6.0.2

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

Build: 5,736
Fixed in build: 6,075


 Description  « Hide
tested with StarTeam8.0
modify the file remotely, commit
modify the same file locally
try to commit it - commit fails with error (the current copy of object is newer than your copy, please refresh)
refresh doesnt help
try checkout - it fails with the same error
try update project – it reports teh same error, but after it check in can be completed (with remote changes overriding by local ones since no merge is supported)

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