# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /data/cvs/netbeans/trunk/nb_all/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: MergeBranchAction.java
*** /data/cvs/netbeans/trunk/nb_all/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchAction.java 1.17
--- /data/cvs/netbeans/trunk/nb_all/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergeBranchAction.java 1.18
***************
*** 162,167 ****
--- 162,169 ----
                  cmd.setMergeRevision1(headTag);
              }
              cmd.setFiles(context.getRootFiles());
+             cmd.setBuildDirectories(true);
+             cmd.setPruneDirectories(true);
          
              return UpdateExecutor.splitCommand(cmd, CvsVersioningSystem.getInstance(), options);
          }