#
#
# patch "NEWS"
#  from [8fb29c212943c90b96bcec7c6c1c2b2bb02cd30d]
#    to [6fe52633e66e618aed9a2b145869d93c35cf4e91]
# 
# patch "monotone.texi"
#  from [80d5f3223267d1edc877181f467d50c0dfbdf9a9]
#    to [921509fd128153692a9a7599bf3ff7798864978c]
#
============================================================
--- NEWS	8fb29c212943c90b96bcec7c6c1c2b2bb02cd30d
+++ NEWS	6fe52633e66e618aed9a2b145869d93c35cf4e91
@@ -21,7 +21,13 @@
         - The 'diff' and 'automate context_diff' commands take a
           '--reverse' option when one revision is specified, to
           control the order of the diff with the workspace.
-        
+
+        - The 'conflict' commands can now handle duplicate name
+          conflicts for directories.
+
+        - The 'conflict' resolution commands now take the 'keep'
+          resolution.
+
 	Bugs fixed
 
 	Internal
============================================================
--- monotone.texi	80d5f3223267d1edc877181f467d50c0dfbdf9a9
+++ monotone.texi	921509fd128153692a9a7599bf3ff7798864978c
@@ -3147,15 +3147,20 @@ @subheading Duplicate Name Conflict
 These conflicts are reported when someone tries to merge the two
 revisions containing the new files.
 
+There are similar conflicts for directories; the process for resolving
+them is different, because we need to worry about the files in the
+directories.
+
 @subsubheading Same file
 For the first case, the conflict is resolved by dropping one file,
 using @command{conflicts} commands. The contents should be manually
 merged, in case they are slightly different. Typically, a user will
 have one of the files in their current workspace; the other can be
 retrieved via @command{automate get_file_of}; the revision id is shown
-in the merge error message. The process can be confusing; here's a
-detailed example.
+in the merge error message.
 
+The process for files can be confusing; here's a detailed example.
+
 Suppose Beth and Abe each commit a new file @file{checkout.sh}. When
 Beth attempts to merge the two heads, she gets a message like:
 
@@ -3234,6 +3239,15 @@ @subsubheading Different files
 Now she has her file in @file{thermostat-honeywell}, and Abe's in
 @file{thermostat-westinghouse}.
 
address@hidden Directories
+When two directories are given the same name, there are still the two
+basic approaches to resolving the conflict; drop or rename. However,
+if a directory is dropped, all the files in it must also be dropped.
+Therefore, it is almost always better to first rename one of the
+directories to a temporary name as the conflict resolution, and
+then deal with the files individually, renaming or merging and
+dropping each. Then finally drop the temporary directory.
+
 @subheading Missing Root Conflict
 
 Monotone's merge strategy is sometimes referred to as
@@ -4875,6 +4889,12 @@ @subsection Conflicts
 For two file conflicts, the possible resolutions are:
 
 @ftable @command
address@hidden keep
+The file is kept in the merge.
+
+This inserts a @var{resolved_keep_left} or @var{resolved_keep_right}
+conflict resolution in the conflicts file.
+
 @item drop
 The file is dropped in the merge.
 
@@ -9278,6 +9298,8 @@ @section Automation
 
 All possible conflict resolutions:
 @verbatim
+   resolved_keep_left
+  resolved_keep_right
    resolved_drop_left
   resolved_drop_right
     resolved_internal