#
#
# patch "NEWS"
#  from [0ca6a4be4c4d8778468cb584963db8c98c1959b2]
#    to [37dd1daa04b10a337bda5fcdfd72dd30edfa32c1]
# 
# patch "monotone.texi"
#  from [b77d61e56958096acec3af24178c9022dbd75e95]
#    to [f97cf1c38ff4b6675072e50795575c59d6d6ff15]
# 
# patch "tests/undrop/__driver__.lua"
#  from [507aeed4632bf912b27910e933aa10007142d007]
#    to [a26d7680d4abe92aada7e48f745b08b47e35fa10]
#
============================================================
--- NEWS	0ca6a4be4c4d8778468cb584963db8c98c1959b2
+++ NEWS	37dd1daa04b10a337bda5fcdfd72dd30edfa32c1
@@ -26,6 +26,8 @@ xxx xxx xx xx:xx:xx UTC 2010
           don't have to worry about forgetting to give the include pattern and
           accidentally trying to sync everything to the second server.
 
+        - New command 'undrop' which undoes a 'drop' done by mistake.
+
         Bugs fixed
 
         - A regression in 0.47 prevent successful execution of push / pull /
============================================================
--- monotone.texi	b77d61e56958096acec3af24178c9022dbd75e95
+++ monotone.texi	f97cf1c38ff4b6675072e50795575c59d6d6ff15
@@ -5103,8 +5103,13 @@ @section Workspace
 is if the @option{--bookkeep-only} option is supplied.  Another is
 if a file has un-committed changes or if a directory is not empty.
 
address@hidden mtn undrop @var{pathname...}
+Undoes a previous ``drop''; useful when you make a mistake. If the
+file was deleted from the workspace, this reverts it. If it was not
+deleted (because it was changed), it just removes the pending drop.
+
 @item mtn [--bookkeep-only] rename @var{src} @var{dst}
address@hidden mtn [--bookkeep-only] mv @var{src} @var{dst}
address@hidden mtn [--bookkeep-only] mv @var{src} @var{dst}
 @itemx mtn [--bookkeep-only] rename @var{src1} @var{...} @var{dst/}
 @itemx mtn [--bookkeep-only] mv @var{src1} @var{...} @var{dst/}
 This command places ``rename'' entries for the paths specified in
============================================================
--- tests/undrop/__driver__.lua	507aeed4632bf912b27910e933aa10007142d007
+++ tests/undrop/__driver__.lua	a26d7680d4abe92aada7e48f745b08b47e35fa10
@@ -73,4 +73,8 @@ check(qgrep("no changes", "stdout"))
 check(mtn("status"), 0, true, false)
 check(qgrep("no changes", "stdout"))
 
+-- file that was not dropped. 'revert' doesn't report an error for
+-- this, so 'undrop' doesn't either.
+check(mtn("undrop", "unchanged"), 0, false, false)
+
 -- end of file