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 196398 - svn rename" do not take place, when renaming via project
Summary: svn rename" do not take place, when renaming via project
Status: RESOLVED FIXED
Alias: None
Product: platform
Classification: Unclassified
Component: Filesystems (show other bugs)
Version: 7.0
Hardware: All All
: P3 normal with 1 vote (vote)
Assignee: Jaroslav Tulach
URL:
Keywords:
: 200962 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-03-07 14:55 UTC by daniela.waranie
Modified: 2011-08-27 17:28 UTC (History)
3 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description daniela.waranie 2011-03-07 14:55:30 UTC
If i rename a file via project explorer e.g. from "Bootstrap.php" to "bootstrap.php", the project explorer shows the new file name ("bootstrap.php") but the file in my filesystem (Project Folder in filesystem) stays "Bootstrap.php". The embedded netbeans SVN client lists the file still as "Bootstrap.php" and the Repository-Path is also with [...]"Bootstrap.php" - this results in the SVN client error:

org.tigris.subversion.javahl.ClientException: '[...]\Bootstrap.php' is already under version control

I am working on a Windows system.

Product Version = NetBeans IDE 7.0 Beta 2 (Build 201102140001)
Operating System = Windows 7 version 6.1 running on x86
Java; VM; Vendor = 1.6.0_22
Runtime = Java HotSpot(TM) Client VM 17.1-b03
Comment 1 daniela.waranie 2011-03-07 15:27:00 UTC
Same effect (file name in filesystem did not change) did not happen on non-svn projects.
Comment 2 daniela.waranie 2011-03-07 15:27:53 UTC
SORRY: 
CORRECT: Same effect (file name in filesystem did not change) is on non-svn projects.
Comment 3 landschaf 2011-03-22 08:16:09 UTC
Same Effect if Project is on a Samba Mount. 
For Testing i make a simple Project on the same(win) Harddisk. Rename index.html to Index.html and the File is untouched in Filesystem.

Netbeans 7.0 Beta 2, Win7 64
Comment 4 Jaroslav Tulach 2011-03-23 10:27:10 UTC
Please verify if this is a duplicate of bug 194940

*** This bug has been marked as a duplicate of bug 194940 ***
Comment 5 daniela.waranie 2011-03-23 14:31:38 UTC
Bug 194940 is about "renaming a file within a refactoring process". Maybe, my trouble is the subjacent problem of Bug 194940.

Not sure if bugfix in 194940 changed the behavior in the project windows (as outlined hin this ticket). Can someone confirm, that this issue is fixed by bugfic 194940, too.
Comment 6 Jaroslav Tulach 2011-03-23 14:40:45 UTC
Can you confirm it is not fixed, before reopening?

*** This bug has been marked as a duplicate of bug 194940 ***
Comment 7 daniela.waranie 2011-04-06 23:07:44 UTC
File is now renamed in project explorer AND file system the correct way.

1)
But now the commit dialog "Diff" function shows an error:
"Can not load remote file for [...]bootstrap.php"
Please remember, that the file name in the SVN repositority is still "Bootstrap.php".

2) 
Commit is not as expected:
The old file in SVN ("Bootstrap.php") should be renamed to "bootstrap.php" first and then this "bootstrap.php" should updated with the "commit-content".

At the moment a "svn rename" do not take place, when renaming via project explorer which results in a "Bootstrap.php" AND a "bootstrap.php" in the SVN repository - breaking the versioning history of that file (it is now handled as to completly differnt files).
Comment 8 Jaroslav Tulach 2011-04-07 06:24:40 UTC
Good to hear filesystem issues are solved. Moving to subversion guys to deal with the rest.
Comment 9 daniela.waranie 2011-04-07 11:19:15 UTC
Just for the records: i tested it with 7.0 RC1
Comment 10 Ondrej Vrabec 2011-04-14 15:00:04 UTC
fix: http://hg.netbeans.org/core-main/rev/28783fcbef13
Comment 11 Ondrej Vrabec 2011-04-14 15:10:48 UTC
fixed on subversion side: bypassing the subversion client limitation on windows. Since svn on windows does not allow renaming 'a' to 'A' directly, we try doing something like: rename 'a' -> 'a_' and then rename 'a_' -> 'a'.

But for the fix to be complete masterfs needs to be modified as well. Jardo, run org.netbeans.modules.subversion.InterceptorTest on Windows, renameA2a_FO fails. If just casing is changed, ProvidedExtensions.rename is bypassed and the file is renamed directly using java.io.File.renameTo: http://hg.netbeans.org/core-main/file/28783fcbef13/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java#l359
Comment 12 Quality Engineering 2011-04-15 08:40:08 UTC
Integrated into 'main-golden', will be available in build *201104150401* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main/rev/28783fcbef13
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: Issue #196398 - svn rename" do not take place, when renaming via project
Comment 13 Jaroslav Tulach 2011-04-20 13:00:36 UTC
I have not managed to run the subversion test (I have cygwin svn only), but I think I understand the problem and can provide the fix: ergonomics#01961cb4b49e
Comment 14 Quality Engineering 2011-04-22 05:05:12 UTC
Integrated into 'main-golden', will be available in build *201104220000* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main/rev/01961cb4b49e
User: Jaroslav Tulach <jtulach@netbeans.org>
Log: #196398: Let the handler handle the case sensitive only rename
Comment 15 Jaroslav Tulach 2011-08-27 17:28:44 UTC
*** Bug 200962 has been marked as a duplicate of this bug. ***