Index: nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java,v
--- nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java	23 Aug 2001 07:59:33 -0000	1.14
+++ nbbuild/antsrc/org/netbeans/nbbuild/NbMerge.java	6 Jun 2002 15:22:47 -0000
@@ -132,7 +132,19 @@ 
             dummy.addDependency (targetprefix + module);
         }
         project.addTarget (dummy);
+        /* This runs bootstrap etc. again, causing problems under 1.5:
         project.executeTarget (dummyName);
+         */
+        Vector fullList = project.topoSort(dummyName, targets);
+        // Now remove earlier ones: already done.
+        Vector doneList = project.topoSort(getOwningTarget().getName(), targets);
+        List todo = new ArrayList(fullList.subList(0, fullList.indexOf(dummy)));
+        todo.removeAll(doneList.subList(0, doneList.indexOf(getOwningTarget())));
+        log("<nbmerge>: new targets to run: " + todo, Project.MSG_VERBOSE);
+        Iterator targit = todo.iterator();
+        while (targit.hasNext()) {
+            ((Target)targit.next()).performTasks();
+        }
 
 /* Done in build.xml        
         Delete delete = (Delete) project.createTask ("delete");