Win a copy of Rust Web Development this week in the Other Languages forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Tim Cooke
  • Campbell Ritchie
  • Ron McLeod
  • Liutauras Vilda
  • Jeanne Boyarsky
Sheriffs:
  • Junilu Lacar
  • Rob Spoor
  • Paul Clapham
Saloon Keepers:
  • Tim Holloway
  • Tim Moores
  • Jesse Silverman
  • Stephan van Hulst
  • Carey Brown
Bartenders:
  • Al Hobbs
  • Piet Souris
  • Frits Walraven

Using svn and netbeans in mac os, it shows updates where there is no updates on the server

 
Ranch Hand
Posts: 551
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Hi,

I am using Mac os and NetBeans IDE and SVN downloaded from http://www.open.collab.net/downloads/community/
The problem is that sometime NetBeans shows that a file is changed on the server but diff does not reveal anything. On the other hand, sometime it suggests that the whole file is changed (during diff) while all likes in the code are identical (checked them one by one).

Is there specific configuration to prevent this behavior?


Thanks.
 
Sheriff
Posts: 67619
173
Mac Mac OS X IntelliJ IDE jQuery TypeScript Java iOS
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
Moved to the IDEs forum.
 
author
Posts: 5856
7
Android Eclipse IDE Ubuntu
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator

raminaa niilian wrote:The problem is that sometime NetBeans shows that a file is changed on the server but diff does not reveal anything


IDEs will show that a file has changed if you saved the file, even if there was no actual change. Example: you add a logging line and save, then remove the logging line and resave. The source is now unchanged, according to you, but he IDE will mark it as changed. A typical way to resync with the repository is to use a revert command.

raminaa niilian wrote:On the other hand, sometime it suggests that the whole file is changed (during diff) while all likes in the code are identical (checked them one by one).


This usually happens when the linefeeds on the files are different. Unix/Linux, Windows and Mac all use different linefeed mechanisms. I don't know if you can tell diff to ignore the linefeed differences. I usually convert one file to the same linefeed format as he other before doing diffs.
 
Don't get me started about those stupid light bulbs.
reply
    Bookmark Topic Watch Topic
  • New Topic