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 64494 - CVS: Conflict resolve tool hangs with multiple conflicts.
Summary: CVS: Conflict resolve tool hangs with multiple conflicts.
Status: VERIFIED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 5.x
Hardware: Other Windows XP
: P1 blocker (vote)
Assignee: Martin Entlicher
URL:
Keywords:
: 64501 (view as bug list)
Depends on:
Blocks:
 
Reported: 2005-09-15 19:39 UTC by kkandasami
Modified: 2005-12-17 07:50 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Screen shots. (235.26 KB, application/octet-stream)
2005-09-15 19:47 UTC, kkandasami 		Details
FileNotFoundException (1.07 KB, text/plain)
2005-09-16 08:06 UTC, Peter Pis 		Details
Thread dump. (13.16 KB, text/plain)
2005-09-16 21:34 UTC, kkandasami 		Details
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 kkandasami 2005-09-15 19:39:29 UTC 
STEPS:
(Only in the case of multiple conflicts)
1) Clicked on the Resolve Conflicts menu item, From CVS menu on the file.
(showing in red)

2) Conflict resolve window opened (attached the screen shots).

3) Clikced on the "Accept&Next" on the "Romote File" View, the changes applied
in the "Result after merge" panel (in green).

4) The Cursor did not move to the next conflict, so I used the "->" icon on the
toolbar. Netbeans hangs, never comes back !!!

Ok, next time I tried using the "Accept" button, it changed successfully.
I used the "->" icon to move to the next conflict. But in the last conflict i.e,
4 out 5, I get the same problem. Netbean hangs without coming back.

I have to kill netbeans process, to work on it .. 

Please let me know, if you could not reproduce the error. 
BTW, I am using the daily build, 0907.
Comment 1 kkandasami 2005-09-15 19:47:10 UTC 
Created attachment 24861 [details]
Screen shots.
Comment 2 _ pkuzel 2005-09-15 21:26:32 UTC 
Please attach freeze full thread dump. On windows produced by pressing 
Ctrl+Pause/Break in console/shell.  
 
Thank you.
Comment 3 Peter Pis 2005-09-16 06:49:50 UTC 
*** Issue 64501 has been marked as a duplicate of this issue. ***
Comment 4 Peter Pis 2005-09-16 08:06:14 UTC 
Exception in console. (FileNotFoundException)
Comment 5 Peter Pis 2005-09-16 08:06:56 UTC 
Created attachment 24865 [details]
FileNotFoundException
Comment 6 _ pkuzel 2005-09-16 10:12:47 UTC 
issue #64501 points to MergePanel:751.
Comment 7 _ pkuzel 2005-09-16 11:04:51 UTC 
Blindly fixed (I cannnot reproduce). Please verify. On reopen attach full thread
dump.

Checking in MergePanel.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergePanel.java,v
 <--  MergePanel.java
new revision: 1.31; previous revision: 1.30
done
Comment 8 kkandasami 2005-09-16 21:32:48 UTC 
Attached the thread dump. (Attachment: issue_64494_thread_bug).
Comment 9 kkandasami 2005-09-16 21:34:02 UTC 
Created attachment 24897 [details]
Thread dump.
Comment 10 Martin Entlicher 2005-09-19 15:03:13 UTC 
It's necessary to perform the highlight actions in AWT.
Comment 11 Martin Entlicher 2005-09-19 15:54:37 UTC 
Also the highlight is now set in AWT:

/cvs/diff/src/org/netbeans/modules/merge/builtin/visualizer/MergePanel.java,v 
<--  MergePanel.java
new revision: 1.33; previous revision: 1.32

Therefore it should be O.K. now in dev builds.
Comment 12 Peter Pis 2005-12-17 07:50:06 UTC 
Verified (NB Build 200512152030)