#
#
# add_dir "tests/noop_merge_into_workspace"
# 
# add_file "tests/noop_merge_into_workspace/__driver__.lua"
#  content [c35b200e70b0ba653022eec3e5da6939e335a306]
#
============================================================
--- tests/noop_merge_into_workspace/__driver__.lua	c35b200e70b0ba653022eec3e5da6939e335a306
+++ tests/noop_merge_into_workspace/__driver__.lua	c35b200e70b0ba653022eec3e5da6939e335a306
@@ -0,0 +1,14 @@
+-- Merging an ancestor or descendant into your workspace doesn't break things.
+mtn_setup()
+
+addfile("foo", "bar")
+commit()
+parent = base_revision()
+addfile("baz", "qux")
+commit()
+child = base_revision()
+
+check(mtn("merge_into_workspace", parent), 1, nil, false)
+
+check(mtn("update", "--revision", parent), 0, false)
+check(mtn("merge_into_workspace", child), 1, nil, false)