# # # patch "cmd_automate.cc" # from [c027b275e7ac563ad234f48e9af50d14abeb1a82] # to [6657668dda25d13076673e4b63dc9657629c40d9] # # patch "monotone.texi" # from [11d4354e74d72c3e6184e7c6946bf5e163d40922] # to [9b7b4b168714e8b980e72d95eba542ecc7234fcd] # ============================================================ --- cmd_automate.cc c027b275e7ac563ad234f48e9af50d14abeb1a82 +++ cmd_automate.cc 6657668dda25d13076673e4b63dc9657629c40d9 @@ -68,7 +68,7 @@ namespace commands { } } -static string const interface_version = "8.2"; +static string const interface_version = "9.0"; // Major or minor number only increments once for each monotone release; // check the most recent release before incrementing this. ============================================================ --- monotone.texi 11d4354e74d72c3e6184e7c6946bf5e163d40922 +++ monotone.texi 9b7b4b168714e8b980e72d95eba542ecc7234fcd @@ -8815,10 +8815,10 @@ @section Automation @itemize @item -8.2: -- Added default resolution for file content conflicts, user +9.0: -- Added default resolution for file content conflicts, user resolutions for others. @code{directory_loop_created} changed to @code{directory_loop}. @item -7.1 -- initial +8.0 -- initial @end itemize @item Purpose: