# # # patch "cmd_automate.cc" # from [c027b275e7ac563ad234f48e9af50d14abeb1a82] # to [6657668dda25d13076673e4b63dc9657629c40d9] # # patch "monotone.texi" # from [29852986ca463e9ed132d7cfb8001ea59ad13b53] # to [794aeeeb1450859129acc05515a60a2dd32c793f] # ============================================================ --- 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 29852986ca463e9ed132d7cfb8001ea59ad13b53 +++ monotone.texi 794aeeeb1450859129acc05515a60a2dd32c793f @@ -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: