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 56815

Summary:	Diff between files from Favorites view is diff between shadows
Product:	utilities	Reporter:	Marian Mirilovic <mmirilovic>
Component:	Diff	Assignee:	Martin Entlicher <mentlicher>
Status:	CLOSED FIXED
Severity:	blocker	Keywords:	SIMPLEFIX
Priority:	P2
Version:	4.x
Hardware:	All
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description Marian Mirilovic 2005-03-22 19:45:01 UTC

NB4.1(200503221900), JDK1.5.0_02

Steps to reproduce:
- run IDE
- add File1 to Favorites
- add File2 to Favorites
- push Diff of these files from Favorites view
-> The diff contains diff between shadows, it means it's diff between paths !

Comment 1 Martin Entlicher 2005-03-22 20:03:34 UTC

:-))
Well, we need to add a special check for DataShadow...
Thanks for catching this.

Comment 2 Martin Entlicher 2005-03-23 18:14:40 UTC

Fixed for Diff and Apply Patch actions:

/cvs/diff/src/org/netbeans/modules/diff/DiffAction.java,v  <--  DiffAction.java
new revision: 1.25; previous revision: 1.24

/cvs/diff/src/org/netbeans/modules/diff/PatchAction.java,v  <--  PatchAction.java
new revision: 1.23; previous revision: 1.22

Comment 3 Marian Mirilovic 2005-03-25 13:41:47 UTC

verified in NB4.1(200503242007)