#
#
# patch "cmd_merging.cc"
#  from [1319e91e0d8119f8079db36332437679e1894b3a]
#    to [f73a1adfb75ff8256038178befb8197bd45d8047]
# 
# patch "tests/resolve_conflicts_errors/__driver__.lua"
#  from [972e02d35c515a9ef5e9d14310698129985e125d]
#    to [0fd2b34544713dc4d497b20b775b5320916983ff]
#
============================================================
--- cmd_merging.cc	1319e91e0d8119f8079db36332437679e1894b3a
+++ cmd_merging.cc	f73a1adfb75ff8256038178befb8197bd45d8047
@@ -1167,6 +1167,8 @@ CMD(store, "store", "", CMD_REF(conflict
   project_t   project(db);
   revision_id left_id, right_id;
 
+  workspace::require_workspace(F("conflicts file must be under _MTN"));
+
   get_conflicts_rids(args, db, project, app, left_id, right_id);
 
   std::ostringstream output;
============================================================
--- tests/resolve_conflicts_errors/__driver__.lua	972e02d35c515a9ef5e9d14310698129985e125d
+++ tests/resolve_conflicts_errors/__driver__.lua	0fd2b34544713dc4d497b20b775b5320916983ff
@@ -91,4 +91,10 @@ check("mtn: misuse: other resolution mus
 canonicalize("stdout")
 check("mtn: misuse: other resolution must be 'drop' or 'rename'\n" == readfile("stdout"))
 
+-- not in workspace; report nice error; conflicts file must be under
+-- _MTN, so need workspace. Fixes bug 30473
+check(indir("..", mtn("conflicts", "store", "--db", "resolve_conflicts_errors/test.db", "--branch=testbranch"), 1, nil, true))
+check(grep("workspace required but not found", "stderr"), 0, true)
+check(grep("conflicts file must be under _MTN", "stderr"), 0, true)
+
 -- end of file