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 191016 - CVS checkin of GUI Builder class does not clear "dirty" status
Summary: CVS checkin of GUI Builder class does not clear "dirty" status
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 7.3
Hardware: All All
: P3 normal with 2 votes (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks: 240811
  Show dependency tree
 
Reported: 2010-10-15 00:05 UTC by mclaborn
Modified: 2014-05-09 07:35 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
IDE log from most recent instance of problem (18.44 KB, application/x-gzip)
2013-09-17 14:27 UTC, mclaborn
Details
cvs log file in (889 bytes, application/octet-stream)
2013-09-18 13:36 UTC, mclaborn
Details
cvs log file out (1.02 KB, application/octet-stream)
2013-09-18 13:36 UTC, mclaborn
Details
cvs log file in - dev build 201311060001 (942 bytes, application/octet-stream)
2013-11-06 21:59 UTC, mclaborn
Details
cvs log file out - dev build 201311060001 (1.13 KB, application/octet-stream)
2013-11-06 21:59 UTC, mclaborn
Details
manually built nbm (226.72 KB, application/octet-stream)
2013-12-05 10:07 UTC, Ondrej Vrabec
Details

Note You need to log in before you can comment on or make changes to this bug.
Description mclaborn 2010-10-15 00:05:15 UTC
Product Version = NetBeans IDE 6.9 (Build 201006101454)
Operating System = Linux version 2.6.32-25-generic running on amd64
Java; VM; Vendor = 1.6.0_20
Runtime = Java HotSpot(TM) 64-Bit Server VM 16.3-b01

When a file has been changed from the base CVS version, the filename shows up in blue font on the editor tab and also in the Projects tree.  Frequently, when I commit changes to a GUI Builder based class (form + java source file) the blue font does not change to black, indicating no change from the base, which is always true immediately following a commit.  If I do a CVS diff on the file, then the font will change to black.
Comment 1 Ondrej Vrabec 2012-03-22 13:45:56 UTC
should be already fixed: #181823. Please reopen if reproducible in 7.1
Comment 2 mclaborn 2012-03-22 19:34:06 UTC
This is still happening, but not on every commit action.

Product Version = NetBeans IDE 7.1 (Build 201112071828)
Operating System = Linux version 2.6.35-32-generic running on amd64
Java; VM; Vendor = 1.6.0_26
Runtime = Java HotSpot(TM) 64-Bit Server VM 20.1-b02
Comment 3 Ondrej Vrabec 2012-03-22 20:28:14 UTC
> This is still happening, but not on every commit action.
If you close and reopen the file, does it turn back to normal/black?
Comment 4 mclaborn 2012-03-26 17:22:47 UTC
Closing and re-opening the file did not turn it black.

It seems to me that on this occasion, the file did turn black initially.  I went to commit some other files, and when I looked back this one had turned blue again.  Did a CVS diff on it and it turned black.
Comment 5 mclaborn 2013-03-15 14:17:49 UTC
Is there any chance of this getting fixed? Still happens to me on a daily basis. I waste time having to go back and check if I've really committed a given file to CVS.
Comment 6 mclaborn 2013-08-21 19:31:38 UTC
This is still a problem.
Comment 7 mclaborn 2013-09-14 17:47:54 UTC
I know this is a low priority, but could someone please take a look at it?  This is a constant irritation to me. It happens several times a day.
Comment 8 Ondrej Vrabec 2013-09-16 08:23:31 UTC
Out of 10 commits i was not able to reproduce even once. I at least added logging: http://hg.netbeans.org/core-main/rev/f0e6895102cf
Download a dev build (when the commit gets integrated into a dev build - you will be notified in this issue) and start the IDE with -J-DcvsClientLog=/home/ondra/Temp/CVSLOG -J-Dorg.netbeans.modules.versioning.system.cvss.ui.actions.commit.CommitExecutor.level=FINE
Comment 9 Quality Engineering 2013-09-17 02:01:15 UTC
Integrated into 'main-silver', will be available in build *201309170002* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/f0e6895102cf
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Task #191016 - CVS checkin of GUI Builder class does not clear "dirty" status
logging added
Comment 10 mclaborn 2013-09-17 14:26:43 UTC
I installed the dev build and set the options as you specified, but nothing showed up in the cvs log file - it was completely empty.

netbeans_default_options="-J-DcvsClientLog=/home/mclaborn/tmp/cvslog -J-Dorg.netbeans.modules.versioning.system.cvss.ui.actions.commit.CommitExecutor.level=FINE -J-client -J-Xss2m -J-Xms32m -J-Xmx2000m -J-XX:PermSize=32m -J-XX:MaxPermSize=384m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.awt.disableMixing=true --fontsize 16 --cp:p /home/javalibs/jgoodies-looks-2.4.1/jgoodies-looks-2.4.1.jar --cp:p /home/javalibs/jgoodies-looks-2.4.1/lib/jgoodies-common-1.2.0.jar --laf Nimbus"


The very first commit I did exhibted the problem: the file commited, the tab turned black for a bit, then turned blue again.  I will attach the messages.log shortly.
Comment 11 mclaborn 2013-09-17 14:27:35 UTC
Created attachment 140175 [details]
IDE log from most recent instance of problem
Comment 12 Ondrej Vrabec 2013-09-17 14:39:42 UTC
> FINE [org.netbeans.modules.versioning.system.cvss.ui.actions.commit.CommitExecutor]: After commit refreshing /home/mclaborn/projects/NetBeans/MMGUI/OrderEntry/src/com/csc/mm/oe2/DialogCustomerAddress2.java:::65,536
Was it this file? Did you commit also changes in its .form file (DialogCustomerAddress2.form)?
Comment 13 Ondrej Vrabec 2013-09-17 14:50:22 UTC
> I installed the dev build and set the options as you specified, but nothing showed up in the cvs log file - it was completely empty.
Make sure the parent folder (/home/mclaborn/tmp) exists
Comment 14 mclaborn 2013-09-17 15:10:10 UTC
It does exist.

pwd
/home/mclaborn/tmp
Comment 15 Ondrej Vrabec 2013-09-18 08:07:07 UTC
> It does exist.
Then i don't know, adding -J-DcvsClientLog=/home/ondra/tmp/cvslog into netbeans.conf works for me and right after a commit both cvslog.in and cvslog.out are generated and contain logged comm with a server
Comment 16 mclaborn 2013-09-18 13:36:02 UTC
My mistake.  I was looking in "cvslog" as a file, didn't look for "cvslog.in" and "cvslog.out".  They are both there.  Will attach them shortly.
Comment 17 mclaborn 2013-09-18 13:36:33 UTC
Created attachment 140214 [details]
cvs log file in
Comment 18 mclaborn 2013-09-18 13:36:54 UTC
Created attachment 140215 [details]
cvs log file out
Comment 19 Ondrej Vrabec 2013-09-20 09:08:02 UTC
for some reason your server does not respond well, for the request:
Comment 20 Ondrej Vrabec 2013-09-20 09:21:33 UTC
> for some reason your server does not respond well, for the request:
hmm, part of the comment was "lost in translation". So again: response from your server does not contain info about the .form file:
> M /cvs/MMGUI/OrderEntry/src/com/csc/mm/oe2/DialogCustomerAddress2.java,v  <--  DialogCustomerAddress2.java
> M new revision: 1.6; previous revision: 1.5
> Checked-in ./
> MMGUI/OrderEntry/src/com/csc/mm/oe2/DialogCustomerAddress2.java
> /DialogCustomerAddress2.java/1.6///
Comment 21 Ondrej Vrabec 2013-09-20 09:46:11 UTC
The usecase is probably:
- modify a file
- modify it back to its original state, it will still be marked modified
- commit
Server does not return info about the file because its content does not change on server and in the IDE it will still represent a modified file
Comment 22 Ondrej Vrabec 2013-09-20 09:46:45 UTC
fix: http://hg.netbeans.org/core-main/rev/3a25594b6858
Comment 23 mclaborn 2013-11-04 16:43:42 UTC
Is there any chance of a fix for this for 7.4 ?
Comment 24 Ondrej Vrabec 2013-11-04 19:08:07 UTC
(In reply to mclaborn from comment #23)
> Is there any chance of a fix for this for 7.4 ?
and have you verified it in trunk? Can you confirm the fix helps?
Comment 25 Ondrej Vrabec 2013-11-06 20:39:03 UTC
... if you don't try and verify it in a dev build, it won't get into 7.4 patch 1. So if you really want to have it in 7.4, now would be the time to test it: http://bits.netbeans.org/download/trunk/nightly/latest/
Comment 26 mclaborn 2013-11-06 21:58:08 UTC
The dev build did not fix the problem.  
I'll attach the cvs log files shortly.
Comment 27 mclaborn 2013-11-06 21:59:14 UTC
Created attachment 141920 [details]
cvs log file in - dev build 201311060001
Comment 28 mclaborn 2013-11-06 21:59:43 UTC
Created attachment 141921 [details]
cvs log file out - dev build 201311060001
Comment 29 Ondrej Vrabec 2013-11-07 07:33:38 UTC
The problem i found is fixed:
1) open a java+form pair and edit *just* the .java file
2) CVS -> Commit, , java file is uploaded to server and the file's tab will turn back to black.

If it does not work for you then you probably have a different scenario and your issue is different from mine. In that case you won't see it fixed in 7.4.
You did make a fresh installation of the daily build and downloaded and installed CVS plugin from update center, didn't you. I am asking because if you imported the plugin from a previous version you won't have the fix because it's only on UC.
Comment 30 mclaborn 2013-11-07 14:42:42 UTC
I think we're talking about the same problem. Here are the exact steps I use.

1) Open a java/form pair.
2) If it opens in the java file, switch to the GUI designer then back to java without making any GUI changes.
3) Make and save a change in the java file.
4) Do the CVS commit.

I don't remember installing or importing the CVS plugin when I tested with the dev build.  I'll re-do that today and make sure I get the dev plugin.
Comment 31 mclaborn 2013-11-07 15:17:45 UTC
The Dev version of the plugin DOES fix the problem.  I tried several times and ever saw the errorneous behavior.  Sorry for the earlier mis-information.

I did notice this:
When saving the first change in the java file, the tab turns blue (dirty) right away, then about 2 seconds later it turns black (clean), then 2 seconds after that turns blue again.  I don't believe I've seen this before.  Could this be a side-effect of your fix?  It is certainly not a huge problem.
Comment 32 Ondrej Vrabec 2013-11-07 15:20:08 UTC
(In reply to mclaborn from comment #31)
> Could this be a side-effect of your fix?  It is certainly not a huge problem.
I don't think so. My fix was done only in commit scope, should not affect any other parts.
Comment 33 Ondrej Vrabec 2013-11-13 09:02:25 UTC
release74 fix: http://hg.netbeans.org/releases/rev/68a6869cf150
Comment 34 mclaborn 2013-12-04 16:54:23 UTC
Did this fix make it into 7.4 patch 1? I have applied patch1 and am still seeing the problem.
Comment 35 Ondrej Vrabec 2013-12-05 08:58:41 UTC
(In reply to mclaborn from comment #34)
> Did this fix make it into 7.4 patch 1? I have applied patch1 and am still
> seeing the problem.
It should have got into 7.4 patch 1. Can you check the version of CVS you have currently installed? If you have 1.25.1... you should get the fix.
Comment 36 Ondrej Vrabec 2013-12-05 10:02:36 UTC
but you are right, i can still reproduce in 7.4 Patch 1. When i build nbm manually and install in 7.4 it gets fixed. I don't know why but for some reason the nbm on update center does not contain the fix. I'll investigate why this happened, hopefully we'll have it fixed in 7.4 patch 2.
Comment 37 Ondrej Vrabec 2013-12-05 10:07:07 UTC
Created attachment 142855 [details]
manually built nbm

or you can install mine nbm manually. But it's unsigned and unofficially built.
Comment 38 mclaborn 2013-12-05 14:55:01 UTC
Thanks for following up.  I'll wait for patch 2.
Comment 39 Ondrej Vrabec 2013-12-06 08:40:44 UTC
An updated version of CVS has been published on the UC (1.25.2.1.42.1), that should contain the fix finally. Can you update it and let me know if it fixes your problem?
Comment 40 mclaborn 2013-12-06 14:32:43 UTC
The new version of the CVS plugin appears to have fixed the problems. I tested 5 or 6 times without a problem.
Comment 41 Ondrej Vrabec 2013-12-06 14:34:06 UTC
good to hear it's finally fixed.