# 
# 
# add_dir "tests/merge_into_workspace_same_rev"
# 
# add_file "tests/merge_into_workspace_same_rev/__driver__.lua"
#  content [990798ba737451deac9b7414bd742bfea3f4ecf1]
# 
# patch "ChangeLog"
#  from [7ba2a1d1b4619b2fffbe6c16472a4a5bada912de]
#    to [0abfa80c11449a741eedbeb42b5e5c0ab8f70d2f]
# 
# patch "cmd_merging.cc"
#  from [7a29c3e480f80cd4dd4ee83c3888069aa4331b77]
#    to [83f4d3eb2f7f5a7c50d4b95fbf5275108905ecc7]
# 
# patch "testsuite.lua"
#  from [ac59c2a75d6ff5cbda9c6c43f3ecd47c52e189bb]
#    to [18efa2dcbb369afeb79da1f172ef26835081a9e9]
# 
============================================================
--- tests/merge_into_workspace_same_rev/__driver__.lua	990798ba737451deac9b7414bd742bfea3f4ecf1
+++ tests/merge_into_workspace_same_rev/__driver__.lua	990798ba737451deac9b7414bd742bfea3f4ecf1
@@ -0,0 +1,12 @@
+mtn_setup()
+
+addfile("bilbo", "this is bilbo's secret diary\n")
+commit()
+anc = base_revision()
+
+addfile("charlie", "this is charlie's file\n")
+commit()
+other = base_revision()
+
+-- try merging the current workspace head into the workspace
+check(mtn("merge_into_workspace", other), 1, nil, false)
============================================================
--- ChangeLog	7ba2a1d1b4619b2fffbe6c16472a4a5bada912de
+++ ChangeLog	0abfa80c11449a741eedbeb42b5e5c0ab8f70d2f
@@ -1,3 +1,10 @@
+2007-02-07  Matthew Gregan  <address@hidden>
+
+	* cmd_merging.cc (CMD(merge_into_workspace)): N() out if user is
+f	trying to merge in the workspace's current revision.
+	* tests/merge_into_workspace_same_rev/*: New test.
+	* testsuite.lua: Add it.
+
 2006-09-25  Zack Weinberg  <address@hidden>
 
 	* work.cc (workspace::get_work_rev): Fold into sole caller,
============================================================
--- cmd_merging.cc	7a29c3e480f80cd4dd4ee83c3888069aa4331b77
+++ cmd_merging.cc	83f4d3eb2f7f5a7c50d4b95fbf5275108905ecc7
@@ -632,6 +632,7 @@ CMD(merge_into_workspace, N_("tree"),
 
   complete(app, idx(args, 0)(), right_id);
   app.db.get_roster(right_id, right);
+  N(!(left_id == right_id), F("workspace is already at revision %s") % left_id);
 
   set<revision_id> left_uncommon_ancestors, right_uncommon_ancestors;
   app.db.get_uncommon_ancestors(left_id, right_id,
@@ -668,7 +669,7 @@ CMD(merge_into_workspace, N_("tree"),
   // perform_content_update, because content changes have been dropped.
   cset update;
   make_cset(*left.first, merge_result.roster, update);
-  
+
   // small race condition here...
   app.work.perform_content_update(update, wca);
   app.work.put_work_rev(merged_rev);
============================================================
--- testsuite.lua	ac59c2a75d6ff5cbda9c6c43f3ecd47c52e189bb
+++ testsuite.lua	18efa2dcbb369afeb79da1f172ef26835081a9e9
@@ -706,4 +706,4 @@ table.insert(tests, "merge_into_workspac
 table.insert(tests, "merge_into_workspace")
 table.insert(tests, "merge_into_workspace_no_changes")
 table.insert(tests, "merge_into_workspace_files_added")
+table.insert(tests, "merge_into_workspace_same_rev")
-table.insert(tests, "merge_into_workspace_attr_corpse")