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 211854 - diff doesn't work for files without classes
Summary: diff doesn't work for files without classes
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 7.2
Hardware: PC Windows 7
: P1 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 214715 215268 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-04-27 13:58 UTC by fredgarlov00
Modified: 2012-07-23 13:44 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
diff should show changes here (33.11 KB, image/png)
2012-04-27 15:00 UTC, fredgarlov00
Details

Note You need to log in before you can comment on or make changes to this bug.
Description fredgarlov00 2012-04-27 13:58:39 UTC
svn diff and diff sidebar do not work anymore for .php file, which doesn't have any class declaration.
Comment 1 Ondrej Brejla 2012-04-27 13:59:56 UTC
I think that "diff action" has nothing to do with PHP...does it?
Comment 2 Ondrej Vrabec 2012-04-27 14:07:16 UTC
> which doesn't have any class declaration.
i don't think that's the case. Describe exactly what does not work, you cannot find the action? You're getting an exception? Maybe you could add some screenshot to demonstrate it.
Comment 3 fredgarlov00 2012-04-27 14:55:11 UTC
1. diff has nothing to do with php but I'm using php build
2. diff works for files which have a php class
3. diff shows BASE (on the left) as empty if the file is a php script without classes declarations
4. diff shows file content in the right window (Locally modified)
5. The file itself has changes and has blue color in Files window

I'm using dev build. Screenshots follows
Comment 4 fredgarlov00 2012-04-27 15:00:12 UTC
Created attachment 118881 [details]
diff should show changes here
Comment 5 fredgarlov00 2012-04-27 15:03:52 UTC
also, if I do revert on the file, it does but does not update content of the file window. I must re-open the file to see reverted changes


Product Version: NetBeans IDE Dev (Build 201204170400)
Java: 1.6.0_30; Java HotSpot(TM) Client VM 20.5-b03
System: Windows 7 version 6.1 running on x86;
Comment 6 Ondrej Vrabec 2012-04-27 16:29:11 UTC
Attach the messages log then after you open the diff with empty left panel: http://wiki.netbeans.org/FaqLogMessagesFile
Comment 7 Ondrej Vrabec 2012-04-30 19:39:30 UTC
reproducible with *every* file residing directly in the root of a subversion *1.7* checkout
Comment 8 Ondrej Vrabec 2012-04-30 19:44:48 UTC
fix: core-main #a38b9e719c2d
Comment 9 Quality Engineering 2012-05-02 10:04:51 UTC
Integrated into 'main-golden', will be available in build *201205020400* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/a38b9e719c2d
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #211854 - diff doesn't work for files without classes
Comment 10 Ondrej Vrabec 2012-06-25 14:39:24 UTC
*** Bug 214715 has been marked as a duplicate of this bug. ***
Comment 11 carljmosca 2012-06-25 14:46:52 UTC
Thank you.  I grabbed a night build just before opening this bug.  Will grab RC1.
Comment 12 Ondrej Vrabec 2012-06-25 14:57:18 UTC
(In reply to comment #11)
> I grabbed a night build just before opening this bug.
No, according to the fragment of the messages log provided in bug #214715, you grabbed 7.2 Beta, not a nightly build.
Comment 13 carljmosca 2012-06-25 15:00:54 UTC
OK...let me try again.

I noticed the problem first in the beta which I have been using.  I have tried several nightly builds since moving to the beta.  The nightly one I downloaded this morning would not let me get to my projects at all so I could not test this particular bug.

Therefore I reported it using the version I can get to work for the most part, beta 2.

I did not say the log was from a nightly build nor does my initial report.
Comment 14 Ondrej Vrabec 2012-07-23 13:44:34 UTC
*** Bug 215268 has been marked as a duplicate of this bug. ***