Resolve spec merge conflicts

Signed-off-by: Solomon Hykes <solomon@dagger.io>

stdlib/europa/dagger/engine/fs.cue

@@ -3,6 +3,7 @@ package engine
 // Read a file from a filesystem tree
 #ReadFile: {
 	_type: "ReadFile"
+	$dagger: task: _name: "ReadFile"
 
 	// Filesystem tree holding the file
 	input: #FS
@@ -18,6 +19,7 @@ package engine
 // Write a file to a filesystem tree, creating it if needed
 #WriteFile: {
 	_type: "WriteFile"
+	$dagger: task: _name: "WriteFile"
 
 	// Input filesystem tree
 	input: #FS
@@ -31,3 +33,56 @@ package engine
 	// Output filesystem tree
 	output: #FS
 }
+
+// Produce an empty directory
+#Scratch: {
+	@dagger(notimplemented)
+	$dagger: task: _name: "Scratch"
+
+	output: #FS
+}
+
+// Create a directory
+#Mkdir: {
+	@dagger(notimplemented)
+	$dagger: task: _name: "Mkdir"
+
+	input: #FS
+
+	// Path of the directory
+	path: string
+	// FIXME: permissions?
+	mode: int
+	// Create parent directories as needed?
+	parents: *true | false
+
+	output: #FS
+}
+
+// Copy files from one FS tree to another
+#Copy: {
+	@dagger(notimplemented)
+	$dagger: task: _name: "Copy"
+
+	input: #FS
+	#CopyInfo
+	output: #FS
+}
+
+#CopyInfo: {
+	source: {
+		root: #FS
+		path: string | *"/"
+	}
+	dest: string
+}
+
+// Merge multiple FS trees into one
+#Merge: {
+	@dagger(notimplemented)
+	$dagger: task: _name: "Merge"
+
+	input: #FS
+	layers: [...#CopyInfo]
+	output: #FS
+}