[Monotone-commits-diffs] net.venge.monotone: 7ee34f5221b68c3dd59dd2a249c7c2e77ff087ab

[code]

revision:            7ee34f5221b68c3dd59dd2a249c7c2e77ff087ab
date:                2010-11-15T22:55:36
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
Make command argument list for 'fmerge' and 'pluck' consistent with how
it's done elsewhere

manifest:
format_version "1"

new_manifest [bd68e0625fa0976b5999b4e628b64803cbbe9d56]

old_revision [2a114436ed3d76c16b2a73b2172c587d98bca464]

patch "cmd_files.cc"
 from [b6fc0e569a082e6f897123a12168f1adf26c5959]
   to [7e9ffd4a06daeb0ef7ab7557d3a656c6b99ab2ad]

patch "cmd_merging.cc"
 from [3f665ae0b10a9800925df54af0eb393c956d43a0]
   to [66c3882326a06d0abf878905bb515de80cc9e905]
============================================================
--- cmd_files.cc	b6fc0e569a082e6f897123a12168f1adf26c5959
+++ cmd_files.cc	7e9ffd4a06daeb0ef7ab7557d3a656c6b99ab2ad
@@ -54,7 +54,8 @@ CMD(fload, "fload", "", CMD_REF(debug), 
   guard.commit();
 }
 
-CMD(fmerge, "fmerge", "", CMD_REF(debug), N_("<parent> <left> <right>"),
+CMD(fmerge, "fmerge", "", CMD_REF(debug),
+    N_("PARENT_FILEID LEFT_FILEID RIGHT_FILEID"),
     N_("Merges 3 files and outputs the result"),
     "",
     options::opts::none)
============================================================
--- cmd_merging.cc	3f665ae0b10a9800925df54af0eb393c956d43a0
+++ cmd_merging.cc	66c3882326a06d0abf878905bb515de80cc9e905
@@ -1243,7 +1243,7 @@ CMD_AUTOMATE(file_merge, N_("LEFT_REVID 
   output << merge_data;
 }
 
-CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[-r FROM] -r TO [PATH...]"),
+CMD(pluck, "pluck", "", CMD_REF(workspace), N_("[PATH...]"),
     N_("Applies changes made at arbitrary places in history"),
     N_("This command takes changes made at any point in history, and "
        "edits your current workspace to include those changes.  The end result "