File tree Expand file tree Collapse file tree
main/clojure/clojure/tools/build/tasks
test/clojure/clojure/tools/build/tasks Expand file tree Collapse file tree Original file line number Diff line number Diff line change 7777 new-content (stream->string in)
7878 new-content-lower (str/lower-case new-content)
7979 seen (or (get-in state [:append-dedupe path]) #{existing-lower})]
80- (println " \n conflict-append-dedupe, seen=" seen)
81- (println " new content:" new-content)
82- (println " contains:" (contains? seen new-content-lower))
80+ ; (println "\nconflict-append-dedupe, seen=" seen)
81+ ; (println "new content:" new-content)
82+ ; (println "contains:" (contains? seen new-content-lower))
8383 (if (contains? seen new-content-lower)
8484 ; ; already seen
8585 {:state (assoc-in state [:append-dedupe path] seen)}
112112 [^FileTime last-modified-time buffer out-dir path write-spec]
113113 (let [{:keys [string stream append] :or {append false }} write-spec
114114 out-file (jio/file out-dir path)]
115+ (when (and append string)
116+ (prn " APPEND" path string))
115117 (if string
116118 (spit out-file string :append ^boolean append)
117119 (copy-stream! ^InputStream stream (BufferedOutputStream. (FileOutputStream. out-file ^boolean append)) buffer))
Original file line number Diff line number Diff line change 207207 (slurp (project-path " target/unzip/META-INF/LICENSE.txt" ))))))
208208
209209(comment
210+ (run-tests )
210211 (test-conflicts-but-files )
211212 )
212213
You can’t perform that action at this time.
0 commit comments