# 
# patch "ChangeLog"
#  from [edf9a73be870b9a7fa9a2749127fe45a63927a00]
#    to [7e159512db69684e276219d19535a66aa25cea55]
# 
# patch "monotone.texi"
#  from [dc9a4ffcfa81f280cce66e7e90a88f180987111f]
#    to [c2ec4ec3f9a87edc9c10b100835c3bbef269253f]
# 
========================================================================
--- ChangeLog	edf9a73be870b9a7fa9a2749127fe45a63927a00
+++ ChangeLog	7e159512db69684e276219d19535a66aa25cea55
@@ -1,3 +1,9 @@
+2005-10-12  Emile Snyder <address@hidden>
+
+	* monotone.texi: add njs's lucid definition of what the disapprove
+	actually means in terms of the revision graph to it's section in
+	the documentation.
+	
 2005-10-12  Matt Johnston  <address@hidden>
 
 	* monotone.cc: return with exit code of 2 on usage output
========================================================================
--- monotone.texi	dc9a4ffcfa81f280cce66e7e90a88f180987111f
+++ monotone.texi	c2ec4ec3f9a87edc9c10b100835c3bbef269253f
@@ -3437,9 +3437,15 @@
 will show up as a new head and thus a subsequent @command{merge} will
 incorporate the inverse of the disapproved changes in the other head(s).
 
-Note that this command only works if @var{id} has exactly one ancestor.
+Conceptually, @code{disapprove}s contract is that disapprove(A) gives a 
+revision B such that whenever B is merged with a descendent D of A the merge 
+will result in what D ``would have looked like'' if A had never happened.
 
+Note that as a consequence of this contract the @code{disapprove} command 
+only works if @var{id} has exactly one ancestor, since it hasn't been 
+worked out how to generate such a descendent in the multi-ancestor case.
 
+
 @item monotone heads address@hidden
 This command lists the ``heads'' of @var{branchname}.