# # # patch "cmd_diff_log.cc" # from [9af7d3366efc27279a4a42e5971d352859de6c26] # to [bd55c33e185979f03a6e5fe2d32188fac1dc0676] # # patch "cmd_merging.cc" # from [5ebc0d909d0ea52fd29bcb5177a9df5595b97121] # to [e05ff152427c0ccc43f41a2df5b361ce5d0e05b5] # # patch "cmd_ws_commit.cc" # from [978acabdbea5739e0b18c7a4187255b7c6343d47] # to [c526804d60744f302780eaf3fd89663836591710] # ============================================================ --- cmd_diff_log.cc 9af7d3366efc27279a4a42e5971d352859de6c26 +++ cmd_diff_log.cc bd55c33e185979f03a6e5fe2d32188fac1dc0676 @@ -408,6 +408,8 @@ prepare_diff(cset & included, app.work.update_current_roster_from_filesystem(new_roster, mask); make_restricted_csets(old_roster, new_roster, included, excluded, mask); + MM(included); + MM(excluded); check_restricted_cset(old_roster, included); new_is_archived = false; @@ -458,6 +460,8 @@ prepare_diff(cset & included, make_restricted_csets(old_roster, new_roster, included, excluded, mask); + MM(included); + MM(excluded); check_restricted_cset(old_roster, included); new_is_archived = true; ============================================================ --- cmd_merging.cc 5ebc0d909d0ea52fd29bcb5177a9df5595b97121 +++ cmd_merging.cc e05ff152427c0ccc43f41a2df5b361ce5d0e05b5 @@ -941,6 +941,8 @@ CMD(pluck, "pluck", "", CMD_REF(workspac make_restricted_csets(*from_roster, to_true_roster, from_to_to, from_to_to_excluded, mask); + MM(from_to_to); + MM(from_to_to_excluded); check_restricted_cset(*from_roster, from_to_to); } N(!from_to_to.empty(), F("no changes to be applied")); ============================================================ --- cmd_ws_commit.cc 978acabdbea5739e0b18c7a4187255b7c6343d47 +++ cmd_ws_commit.cc c526804d60744f302780eaf3fd89663836591710 @@ -207,6 +207,8 @@ CMD(revert, "revert", "", CMD_REF(worksp // excluded cset pending in MTN/work which must be valid against the // old roster. + MM(included); + MM(excluded); check_restricted_cset(old_roster, excluded); node_map const & nodes = old_roster.all_nodes();