[jira] [Created] (NETBEANS-4026) SVN: New folders after merge aren't committed

["Björn Tantau (Jira)" <ji...@apache.org>]

Björn Tantau created NETBEANS-4026:
--------------------------------------

             Summary: SVN: New folders after merge aren't committed
                 Key: NETBEANS-4026
                 URL: https://issues.apache.org/jira/browse/NETBEANS-4026
             Project: NetBeans
          Issue Type: Bug
          Components: versioncontrol - Subversion
    Affects Versions: 11.2
         Environment: Kubuntu 18.04
            Reporter: Björn Tantau


When I add new folders in one svn branch (branch-to-merge) and then go to another branch (trunk) and merge the changes from branch-to-merge into trunk only changes to files are shown and committed.

The folders are shown as new in the projects view. Right clicking on them and selecting Subversion -> Commit will commit them as expected. But committing from the root folder will not show them.

 

 To reproduce:
 # Set up svn with two identical branches.
 # Switch to second branch through Subversion -> Copy -> Switch to Copy
 # Do some changes, add folders with new files and commit.
 # Switch to first branch.
 # Merge changes via Subversion -> Copy -> Merge Changes -> One Repository Folder Since Its Origin
 # Commit Changes through Subversion -> Commit

Expected Result:

All changed files and all new files and folders are commited to the first branch.

Actual Result:

Only changed files are commited to the first branch.

Workarounds:

Restart Netbeans or commit the new folders individually.

Notes:

svn status actually shows the new folders, so the issue seems to be with Netbeans.

I marked this as critical because in a large project you might not notice the missing folders and thus commit something incomplete to trunk and push it to production with missing files. (this is exactly what happened to me)



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists