Watch task should merge new fileset with the one passed to watch task

[martinklepsch]

No description provided.

[micha]

I can't reproduce this. See https://github.com/boot-clj/boot/blob/master/boot/core/src/boot/core.clj#L658 and https://github.com/boot-clj/boot/blob/master/boot/core/src/boot/task/built_in.clj#L232.

[martinklepsch]

@pandeiro reported this in combination with boot reload and boot cljs repl. Some specific ordering was needed. I think things didn't work if repl task came before watch.

[pandeiro]

I can come up with a minimal repro next week. Thanks for looking into this
guys.
On Oct 31, 2015 10:37 PM, "Martin Klepsch" notifications@github.com wrote:

@pandeiro https://github.com/pandeiro reported this in combination with
boot reload and boot cljs repl. Some specific ordering was needed. I think
things didn't work if repl task came before watch.

—
Reply to this email directly or view it on GitHub
#330 (comment).

[pandeiro]

So here's an example: https://github.com/pandeiro/jamal/tree/cljs-repl-before-watch

If you compare that branch with master, the only difference is where the cljs-repl task it placed: before and after (watch) , respectively.

[martinklepsch]

I created a more minimal reproduction case, will try to figure out what's going wrong.
https://github.com/martinklepsch/watch-bug

@micha let me know if this is expected for some reason.

[micha]

@martinklepsch thanks for the repro case, I see what the problem is now. 👍 🚀

[martinklepsch]

@micha I just found it too! 😄

[micha]

(defn reset-fileset
  "Updates the user directories in the fileset with the latest project files,
  returning a new immutable fileset. When called with no args returns a new
  fileset containing only the latest project files."
  [& [fileset]]
  (let [fileset (when fileset (rm fileset (user-files fileset)))]
    (sync-user-dirs!)
    (-> (new-fileset)
        (add-user-asset (first (user-asset-dirs)))
        (add-user-source (first (user-source-dirs)))
        (add-user-resource (first (user-resource-dirs)))
        (update-in [:tree] merge (:tree fileset)))))