<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Darcs.Patch.Conflict</title><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" /><script src="haddock-util.js" type="text/javascript"></script><script type="text/javascript">//<![CDATA[
window.onload = function () {pageLoad();setSynopsis("mini_Darcs-Patch-Conflict.html");};
//]]>
</script></head><body><div id="package-header"><ul class="links" id="page-menu"><li><a href="src/Darcs-Patch-Conflict.html">Source</a></li><li><a href="index.html">Contents</a></li><li><a href="doc-index.html">Index</a></li></ul><p class="caption">darcs-2.8.3: a distributed, interactive, smart revision control system</p></div><div id="content"><div id="module-header"><table class="info"><tr><th>Safe Haskell</th><td>Safe-Infered</td></tr></table><p class="caption">Darcs.Patch.Conflict</p></div><div id="interface"><h1>Documentation</h1><div class="top"><p class="src"><span class="keyword">class</span> (<a href="Darcs-Patch-Effect.html#t:Effect">Effect</a> p, <a href="Darcs-Patch-Inspect.html#t:PatchInspect">PatchInspect</a> (<a href="Darcs-Patch-Prim-Class.html#t:PrimOf">PrimOf</a> p)) => <a name="t:Conflict" class="def">Conflict</a> p <span class="keyword">where</span><a href="src/Darcs-Patch-Conflict.html#Conflict" class="link">Source</a></p><div class="subs methods"><p class="caption">Methods</p><p class="src"><a name="v:listConflictedFiles" class="def">listConflictedFiles</a> :: p x y -> [<a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/System-IO.html#t:FilePath">FilePath</a>]<a href="src/Darcs-Patch-Conflict.html#listConflictedFiles" class="link">Source</a></p><p class="src"><a name="v:resolveConflicts" class="def">resolveConflicts</a> :: p x y -> [[<a href="Darcs-Witnesses-Sealed.html#t:Sealed">Sealed</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> (<a href="Darcs-Patch-Prim-Class.html#t:PrimOf">PrimOf</a> p) y)]]<a href="src/Darcs-Patch-Conflict.html#resolveConflicts" class="link">Source</a></p><p class="src"><a name="v:conflictedEffect" class="def">conflictedEffect</a> :: p x y -> [<a href="Darcs-Patch-Conflict.html#t:IsConflictedPrim">IsConflictedPrim</a> (<a href="Darcs-Patch-Prim-Class.html#t:PrimOf">PrimOf</a> p)]<a href="src/Darcs-Patch-Conflict.html#conflictedEffect" class="link">Source</a></p></div><div class="subs instances"><p id="control.i:Conflict" class="caption collapser" onclick="toggleSection('i:Conflict')">Instances</p><div id="section.i:Conflict" class="show"><table><tr><td class="src">(<a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> p, <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> p) => <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> (<a href="Darcs-Witnesses-Ordered.html#t:RL">RL</a> p)</td><td class="doc empty"> </td></tr><tr><td class="src">(<a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> p, <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> p) => <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p)</td><td class="doc empty"> </td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim => <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> (<a href="Darcs-Patch-V1-Core.html#t:Patch">Patch</a> prim)</td><td class="doc empty"> </td></tr><tr><td class="src">(<a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> p, <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> p) => <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> (<a href="Darcs-Patch-Named.html#t:Named">Named</a> p)</td><td class="doc empty"> </td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim => <a href="Darcs-Patch-Conflict.html#t:Conflict">Conflict</a> (<a href="Darcs-Patch-V2-Real.html#t:RealPatch">RealPatch</a> prim)</td><td class="doc empty"> </td></tr></table></div></div></div><div class="top"><p class="src"><span class="keyword">class</span> <a name="t:CommuteNoConflicts" class="def">CommuteNoConflicts</a> p <span class="keyword">where</span><a href="src/Darcs-Patch-Conflict.html#CommuteNoConflicts" class="link">Source</a></p><div class="subs methods"><p class="caption">Methods</p><p class="src"><a name="v:commuteNoConflicts" class="def">commuteNoConflicts</a> :: (p <a href="Darcs-Witnesses-Ordered.html#t::-62-">:></a> p) x y -> <a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Data-Maybe.html#t:Maybe">Maybe</a> ((p <a href="Darcs-Witnesses-Ordered.html#t::-62-">:></a> p) x y)<a href="src/Darcs-Patch-Conflict.html#commuteNoConflicts" class="link">Source</a></p><div class="doc"><p>If <code><a href="Darcs-Patch-Conflict.html#v:commuteNoConflicts">commuteNoConflicts</a></code> <code>x :> y</code> succeeds, we know that that <code>x</code> commutes
past <code>y</code> without any conflicts. This function is useful for patch types
for which <code>commute</code> is defined to always succeed; so we need some way to
pick out the specific cases where commutation succeeds without any conflicts.
</p></div></div><div class="subs instances"><p id="control.i:CommuteNoConflicts" class="caption collapser" onclick="toggleSection('i:CommuteNoConflicts')">Instances</p><div id="section.i:CommuteNoConflicts" class="show"><table><tr><td class="src"><a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> p => <a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> (<a href="Darcs-Witnesses-Ordered.html#t:RL">RL</a> p)</td><td class="doc empty"> </td></tr><tr><td class="src"><a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> p => <a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> (<a href="Darcs-Witnesses-Ordered.html#t:FL">FL</a> p)</td><td class="doc empty"> </td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim => <a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> (<a href="Darcs-Patch-V1-Core.html#t:Patch">Patch</a> prim)</td><td class="doc empty"> </td></tr><tr><td class="src"><a href="Darcs-Patch-Prim-Class.html#t:PrimPatch">PrimPatch</a> prim => <a href="Darcs-Patch-Conflict.html#t:CommuteNoConflicts">CommuteNoConflicts</a> (<a href="Darcs-Patch-V2-Real.html#t:RealPatch">RealPatch</a> prim)</td><td class="doc empty"> </td></tr></table></div></div></div><div class="top"><p class="src"><span class="keyword">data</span> <a name="t:IsConflictedPrim" class="def">IsConflictedPrim</a> prim <span class="keyword">where</span><a href="src/Darcs-Patch-Conflict.html#IsConflictedPrim" class="link">Source</a></p><div class="subs constructors"><p class="caption">Constructors</p><table><tr><td class="src"><a name="v:IsC" class="def">IsC</a> :: !<a href="Darcs-Patch-Conflict.html#t:ConflictState">ConflictState</a> -> !(prim x y) -> <a href="Darcs-Patch-Conflict.html#t:IsConflictedPrim">IsConflictedPrim</a> prim</td><td class="doc empty"> </td></tr></table></div></div><div class="top"><p class="src"><span class="keyword">data</span> <a name="t:ConflictState" class="def">ConflictState</a> <a href="src/Darcs-Patch-Conflict.html#ConflictState" class="link">Source</a></p><div class="subs constructors"><p class="caption">Constructors</p><table><tr><td class="src"><a name="v:Okay" class="def">Okay</a></td><td class="doc empty"> </td></tr><tr><td class="src"><a name="v:Conflicted" class="def">Conflicted</a></td><td class="doc empty"> </td></tr><tr><td class="src"><a name="v:Duplicated" class="def">Duplicated</a></td><td class="doc empty"> </td></tr></table></div><div class="subs instances"><p id="control.i:ConflictState" class="caption collapser" onclick="toggleSection('i:ConflictState')">Instances</p><div id="section.i:ConflictState" class="show"><table><tr><td class="src"><a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Data-Eq.html#t:Eq">Eq</a> <a href="Darcs-Patch-Conflict.html#t:ConflictState">ConflictState</a></td><td class="doc empty"> </td></tr><tr><td class="src"><a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Data-Ord.html#t:Ord">Ord</a> <a href="Darcs-Patch-Conflict.html#t:ConflictState">ConflictState</a></td><td class="doc empty"> </td></tr><tr><td class="src"><a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Text-Read.html#t:Read">Read</a> <a href="Darcs-Patch-Conflict.html#t:ConflictState">ConflictState</a></td><td class="doc empty"> </td></tr><tr><td class="src"><a href="/usr/share/doc/ghc/html/libraries/base-4.5.0.0/Text-Show.html#t:Show">Show</a> <a href="Darcs-Patch-Conflict.html#t:ConflictState">ConflictState</a></td><td class="doc empty"> </td></tr></table></div></div></div></div></div><div id="footer"><p>Produced by <a href="http://www.haskell.org/haddock/">Haddock</a> version 2.10.0</p></div></body></html>
