[#IDEADEV-9237] Diff with CVS ignores blank line at top of file

IDEA: Development

Diff with CVS ignores blank line at top of file

Created: 03 Aug 06 00:39 Updated: 11 Oct 07 18:38

Component/s:

Diff/Merge

Fix Version/s:

Diana Final

Original Estimate:

Unknown

Remaining Estimate:

Unknown

Time Spent:

Unknown

Build:	5,581
Severity:	Low

Description

« Hide

A blank line is being inserted at the top of the file above the comment with the copyright notice for that file. The file is not marked as modified but a CVS Compare with Same Repository Version shows the line as being inserted.

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Dmitry Jemerov - 03 Aug 06 11:16

When is it being inserted, and does it still happen if you remove all third-party plugins?

[ Permlink | « Hide ]

Eugene Vigdorchik - 03 Aug 06 16:59

Proably Copyright plugin issue?

[ Permlink | « Hide ]

Gordon Tyler - 03 Aug 06 19:12

I'm not sure when it is being inserted. It doesn't appear to happen with all files.

At first I thought it had been inserted by an external script used recently to update the copyright notice in all files (I don't use the Copyright plugin) but then I noticed that it was marked as a local working copy change – not in the repository.

The only third-party plugin I have installed for the EAP builds is TMate.

I'll attempt to pinpoint when the change is occuring.

[ Permlink | « Hide ]

Gordon Tyler - 03 Aug 06 19:23

I am mistaken. The blank line is not being inserted by IDEA. It already exists in the file as checked out from the repository. The IDEA CVS Diff is showing the repository version of the file as NOT having the blank line.

I checked the file on disk using a standalone text editor and the blank line is there. Then, using TortoiseCVS, I diffed the working copy file to the latest revision in the repository. They're identical. The version in the repository includes the blank line.

So it would seem that the IDEA CVS Diff is ignoring the first line of the repository version for some reason.

[ Permlink | « Hide ]

Dmitry Jemerov - 01 Sep 06 16:21

I wasn't able to reproduce this. What CVS server version are you using? What is the type of the file (Java, JSP, plain text, something binary, etc)?

[ Permlink | « Hide ]

Gordon Tyler - 05 Sep 06 19:25

CVS version 1.11.2 running on RHEL ES release 3. Client OS is Windows XP. The type of file is Java.

[ Permlink | « Hide ]

Irina Petrovskaya - 08 Sep 06 13:35

to recreate:
externally (using command line cvs for example) check out some java file ;
in text editor insert the leading empty line to it. [Make some other changes or not]
check in the file
in IDEA the file has 'changed on server' status
invoke cvs/compare with last repository version:

if the only change is the leading lank line, the versions are reported to be identcal; if some extra changes have been made, the dialog showing the diference is opened. However, it doesn't show changes in the first line.
b 5669