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 "\nconflict-append-dedupe, seen=" seen)
81- ; (println "new content:" new-content)
82- ; (println "contains:" (contains? seen new-content-lower))
80+ (println " \n conflict-append-dedupe" path)
81+ (println " state:" state)
82+ (println " seen:" seen)
83+ (println " existing:" existing-lower)
84+ (println " new content:" new-content-lower)
85+ (println " contains:" (contains? seen new-content-lower))
86+ (println )
8387 (if (contains? seen new-content-lower)
8488 ; ; already seen
8589 {:state (assoc-in state [:append-dedupe path] seen)}
Original file line number Diff line number Diff line change 196196 (slurp (project-path " j2/append.txt" )))
197197 (slurp (project-path " target/unzip/append.txt" ))))
198198
199- (println " j1: " (slurp (project-path " j1/META-INF/LICENSE.txt" )))
200- (println " j2: " (slurp (project-path " j2/META-INF/LICENSE.txt" )))
201- (println " j3: " (slurp (project-path " j3/META-INF/LICENSE.txt" )))
202- (println " unzip: " (slurp (project-path " target/unzip/META-INF/LICENSE.txt" )))
199+ ; (println "j1: " (slurp (project-path "j1/META-INF/LICENSE.txt")))
200+ ; (println "j2: " (slurp (project-path "j2/META-INF/LICENSE.txt")))
201+ ; (println "j3: " (slurp (project-path "j3/META-INF/LICENSE.txt")))
202+ ; (println "unzip: " (slurp (project-path "target/unzip/META-INF/LICENSE.txt")))
203203
204204 ; ; LICENSE files append but no dupes - include j1 and j2, but not j3 (dupe of j1)
205205 (is (= (str (slurp (project-path " j1/META-INF/LICENSE.txt" )) (System/lineSeparator )
You can’t perform that action at this time.
0 commit comments