Conflict inside derivable.slate

[Paul Dufresne]

Hum, ok, your repositories are ok.

So I decided to search on my side.

First, I did darcs revert to remove the unrecorded stuff on derivable.slate 
I
had.

Then I discovered that by using --verbose in darcs pull, we get info on 
patch we
have that the other don't have:
===
paul at arctanov:~/myslate/main $ darcs pull --verbose Pulling from 
http://slate.tunes.org/repos/main...
We have the following new (to them) patches:
Tue Mar 15 19:34:07 EST 2005  Brian T. Rice <water at tunes.org>
  * Modifications to addPrototype:derivedFrom: for redefinitions.

They have the following patches to pull:
No remote changes to pull in!
paul at arctanov:~/myslate/main $
===

So I check what this patch is:
===
paul at arctanov:~/myslate/main $ darcs annotate --patch="Modifications to 
addPrototype:derivedFrom: for redefinitions."
[Modifications to addPrototype:derivedFrom: for redefinitions.
Brian T. Rice <water at tunes.org>**20050316023306] {
merger 0.0 (
hunk ./src/lib/derivable.slate 104
-  newProto: (parents size = 1
-    ifTrue: [(parents at: 0) derive]
-    ifFalse: [(parents at: 0) derive &mixins: (parents allButFirst: 1)]).
+  newProto: ((parents at: 0) derive &mixins:
+    (parents size = 1 ifFalse: [parents allButFirst: 1])).
hunk ./src/lib/derivable.slate 103
-  parents isEmpty ifTrue: [error: 'Parent objects must be supplied.'].
-  newProto: (parents size = 1
-    ifTrue: [(parents at: 0) derive]
-    ifFalse: [(parents at: 0) derive &mixins: (parents allButFirst: 1)]).
+  parents isEmpty ifTrue: [error: 'Parent objects must be supplied.'].
+  newProto: ((parents at: 0) derive &mixins:
+    (parents size = 1 ifFalse: [parents allButFirst: 1])).
)
merger 0.0 (
hunk ./src/lib/derivable.slate 111
-              unlessSatisfies: [| :old | old traitsWindow delegateValues
-                                  = newProto traitsWindow delegateValues]]
+              unlessSatisfies:
+                [| :old oldParents newParents |
+                 "Modified equality using == over each delegate pair."
+                 oldParents: old traitsWindow delegateValues.
+                 newParents: newProto traitsWindow delegateValues.
+                 oldParents size = newParents size
+                   /\ [oldParents keys allSatisfy:
+                     [| :index | (oldParents at: index) == (newParents at: 
index)]]]]
hunk ./src/lib/derivable.slate 111
-              unlessSatisfies: [| :old | old traitsWindow delegateValues
-                                  = newProto traitsWindow delegateValues]]
+              unlessSatisfies:
+                [| :old oldParents newParents |
+                 "Modified equality using == over each delegate pair."
+                 oldParents: old traitsWindow delegateValues.
+                 newParents: newProto traitsWindow delegateValues.
+                 oldParents size = newParents size
+                   /\ [oldParents keys allSatisfy:
+                     [| :index | (oldParents at: index) == (newParents at: 
index)]]]]
)
merger 0.0 (
hunk ./src/lib/derivable.slate 114
-  (x atSlotNamed: protoName)
-    `>> [addPrintName: protoName name.]
+  (x atSlotNamed: protoName) `>> [addPrintName: protoName name. ]
hunk ./src/lib/derivable.slate 114
-  (x atSlotNamed: protoName)
-    `>> [addPrintName: protoName name.]
+  (x atSlotNamed: protoName) `>> [addPrintName: protoName name. ]
)
merger 0.0 (
hunk ./src/lib/derivable.slate 124
-
+
hunk ./src/lib/derivable.slate 124
-
+
)
}
paul at arctanov:~/myslate/main $
===

Is this a patch I should "remove" or is it a patch you lost and like to have 
back?

--Paul