This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 22798 - Cancelled merge tool leaves files locked.
Summary: Cancelled merge tool leaves files locked.
Status: CLOSED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 3.x
Hardware: PC Windows ME/2000
: P2 blocker (vote)
Assignee: Martin Entlicher
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-04-25 15:46 UTC by Jiri Kovalsky
Modified: 2003-06-30 17:41 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jiri Kovalsky 2002-04-25 15:46:47 UTC 
Development build #200204250100 of NetBeans 3.4
Windows 2000 with JDK 1.4.1 build #10

Description:
============
If user decides to cancel the merge tool, it will
get him/her into troubles. The file remains locked
which means that "Resolve Conflicts" action will
not work next time and file can't be deleted.

Steps to reproduce:
===================
1. Mount CVS filesystem and get some file to
[Merge Conflicts] status.
2. Invoke "Resolve Conflicts" action from its
popup menu.
3. Push "Cancel" button and repeat step 2.
4. It won't show the tool again. Also deletion of
the file is not possible.
Comment 1 Martin Entlicher 2002-04-26 15:11:01 UTC 
Starting to work on it...
Comment 2 Martin Entlicher 2002-04-26 16:08:17 UTC 
The problem was, that sometimes the merge dialog was not opened in
GUI, but existed in closed state. This caused the file be locked
forever.
Fixed in dev build Apr 29.
Comment 3 Jiri Kovalsky 2002-06-19 16:10:42 UTC 
Verified in development build #200206190100 of NetBeans 3.4.
Comment 4 Quality Engineering 2003-06-30 17:41:08 UTC 
Resolved for 3.3.x or earlier, no new info since then -> closing.