# # # patch "cmd_merging.cc" # from [be7e9979e0f03853b2b7f858f1cfe84b16b19563] # to [dc9c53f929b6ccca1b997bcf7e64237b5340a89b] # # patch "cmd_netsync.cc" # from [ce40d6901889bc628c54a759b95f9feee72bfcba] # to [1ae829e2d3422fa24d0eac1ff2c1ad9ec9a2a6b2] # # patch "cmd_ws_commit.cc" # from [dc09eabd9e311dee30ef37ef52e2f0a49e19b268] # to [d1cea384ed16b9443f13c685dad44c45146d72c2] # ============================================================ --- cmd_merging.cc be7e9979e0f03853b2b7f858f1cfe84b16b19563 +++ cmd_merging.cc dc9c53f929b6ccca1b997bcf7e64237b5340a89b @@ -288,7 +288,7 @@ CMD_AUTOMATE(update, "", "If not, update the workspace to the head of the branch."), options::opts::none) { - commands::update_cmd.exec(app, execid, args); + commands::update_cmd.exec(app, execid, args, output); } // Subroutine of CMD(merge) and CMD(explicit_merge). Merge LEFT with RIGHT, @@ -447,7 +447,7 @@ CMD_AUTOMATE(merge, "", N_("Merges unmerged heads of a branch"), "", options::opts::none) { - commands::merge_cmd.exec(app, execid, args); + commands::merge_cmd.exec(app, execid, args, output); } CMD(propagate, "propagate", "", CMD_REF(tree), ============================================================ --- cmd_netsync.cc ce40d6901889bc628c54a759b95f9feee72bfcba +++ cmd_netsync.cc 1ae829e2d3422fa24d0eac1ff2c1ad9ec9a2a6b2 @@ -173,7 +173,7 @@ CMD_AUTOMATE(push, "to the netsync server at the address ADDRESS."), options::opts::none) { - commands::push_cmd.exec(app, execid, args); + commands::push_cmd.exec(app, execid, args, output); } CMD(pull, "pull", "", CMD_REF(network), @@ -203,7 +203,7 @@ CMD_AUTOMATE(pull, "from the netsync server at the address ADDRESS."), options::opts::none) { - commands::pull_cmd.exec(app, execid, args); + commands::pull_cmd.exec(app, execid, args, output); } CMD(sync, "sync", "", CMD_REF(network), @@ -231,7 +231,7 @@ CMD_AUTOMATE(sync, "with the netsync server at the address ADDRESS."), options::opts::none) { - commands::sync_cmd.exec(app, execid, args); + commands::sync_cmd.exec(app, execid, args, output); } class dir_cleanup_helper ============================================================ --- cmd_ws_commit.cc dc09eabd9e311dee30ef37ef52e2f0a49e19b268 +++ cmd_ws_commit.cc d1cea384ed16b9443f13c685dad44c45146d72c2 @@ -1225,7 +1225,7 @@ CMD_AUTOMATE(commit, N_("Commits workspace changes to the database"), "", options::opts::none) { - commands::commit_cmd.exec(app, execid, args); + commands::commit_cmd.exec(app, execid, args, output); } CMD_NO_WORKSPACE(setup, "setup", "", CMD_REF(tree), N_("[DIRECTORY]"),