# 
# 
# add_dir "tests/workspace_migration/twoparent-2"
# 
# add_dir "tests/workspace_migration/twoparent-2/_MTN"
# 
# add_file "tests/workspace_migration/twoparent-2/_MTN/format"
#  content [7448d8798a4380162d4b56f9b452e2f6f9e24e7a]
# 
# add_file "tests/workspace_migration/twoparent-2/_MTN/log"
#  content [d3664ada696aa1b7855394a2f7eee66281825adf]
# 
# add_file "tests/workspace_migration/twoparent-2/_MTN/monotonerc"
#  content [339d19b34553f03bce2ca334618ac0054a1fdd4e]
# 
# add_file "tests/workspace_migration/twoparent-2/_MTN/options"
#  content [a2a92cf608d8e19dee7ad9ac2c4c1d38e5d6bc76]
# 
# add_file "tests/workspace_migration/twoparent-2/_MTN/revision"
#  content [4ae78d0aa135cec1096945787d21b554782bf52c]
# 
# add_file "tests/workspace_migration/twoparent-2/attrfile"
#  content [f277e672aa2fb3b984b94bbc6aeb72401bf619fe]
# 
# add_file "tests/workspace_migration/twoparent-2/testfile"
#  content [a9c24589987aa6b2771ec6d8a419499a563bfa31]
# 
# add_file "tests/workspace_migration/twoparent.lua"
#  content [581c3f3571a87e4d2ab8d43f204974f31ee6c425]
# 
# patch "ChangeLog"
#  from [f9e96bcb4c8ab542d86cf9759887c94cefadbc09]
#    to [8f4658ef76ca4a493fca7535ac9efcd46330b305]
# 
# patch "tests/workspace_migration/__driver__.lua"
#  from [7bbb0ae37bd598e625f2df0f6e5c11c46364855c]
#    to [e3b4942919d5e99c74ae0098986fa216d780bf40]
# 
============================================================
--- tests/workspace_migration/twoparent-2/_MTN/format	7448d8798a4380162d4b56f9b452e2f6f9e24e7a
+++ tests/workspace_migration/twoparent-2/_MTN/format	7448d8798a4380162d4b56f9b452e2f6f9e24e7a
@@ -0,0 +1 @@
+2
============================================================
--- tests/workspace_migration/twoparent-2/_MTN/log	d3664ada696aa1b7855394a2f7eee66281825adf
+++ tests/workspace_migration/twoparent-2/_MTN/log	d3664ada696aa1b7855394a2f7eee66281825adf
@@ -0,0 +1 @@
+oh frabjous patch, calloo callay
============================================================
--- tests/workspace_migration/twoparent-2/_MTN/monotonerc	339d19b34553f03bce2ca334618ac0054a1fdd4e
+++ tests/workspace_migration/twoparent-2/_MTN/monotonerc	339d19b34553f03bce2ca334618ac0054a1fdd4e
@@ -0,0 +1 @@
+-- io.stderr:write("warning: bandersnatch insufficiently frumious\n")
============================================================
--- tests/workspace_migration/twoparent-2/_MTN/options	a2a92cf608d8e19dee7ad9ac2c4c1d38e5d6bc76
+++ tests/workspace_migration/twoparent-2/_MTN/options	a2a92cf608d8e19dee7ad9ac2c4c1d38e5d6bc76
@@ -0,0 +1,4 @@
+database "/twas/brillig/and/the/slithy/toves.mtn"
+  branch "did.gyre.and.gimble.in.the.wabe"
+     key "address@hidden"
+  keydir "/and/the/mome/raths/outgrabe"
============================================================
--- tests/workspace_migration/twoparent-2/_MTN/revision	4ae78d0aa135cec1096945787d21b554782bf52c
+++ tests/workspace_migration/twoparent-2/_MTN/revision	4ae78d0aa135cec1096945787d21b554782bf52c
@@ -0,0 +1,11 @@
+format_version "1"
+
+new_manifest [0000000000000000000000000000000000000002]
+
+old_revision [c3b220202e4e554005917b1f218406b716a039b9]
+
+old_revision [db5b36ca58a34c482f57463dd04c450647d53954]
+
+  set "attrfile"
+ attr "my other car"
+value "made of meat"
============================================================
--- tests/workspace_migration/twoparent-2/attrfile	f277e672aa2fb3b984b94bbc6aeb72401bf619fe
+++ tests/workspace_migration/twoparent-2/attrfile	f277e672aa2fb3b984b94bbc6aeb72401bf619fe
@@ -0,0 +1 @@
+this file has attributes
============================================================
--- tests/workspace_migration/twoparent-2/testfile	a9c24589987aa6b2771ec6d8a419499a563bfa31
+++ tests/workspace_migration/twoparent-2/testfile	a9c24589987aa6b2771ec6d8a419499a563bfa31
@@ -0,0 +1,2 @@
+left
+right
============================================================
--- tests/workspace_migration/twoparent.lua	581c3f3571a87e4d2ab8d43f204974f31ee6c425
+++ tests/workspace_migration/twoparent.lua	581c3f3571a87e4d2ab8d43f204974f31ee6c425
@@ -0,0 +1,31 @@
+---- If you change this code, you will have to regenerate all of the
+---- "twoparent-N" workspaces.
+
+return {
+   min_format = 2,
+   creator =
+      function ()
+	 check(mtn("setup", "-b", "twoparent-branch", "twoparent-current"))
+	 chdir("twoparent-current")
+	 addfile("testfile", "ancestor\nancestor")
+	 addfile("attrfile", "this file has attributes")
+	 commit()
+	 anc = base_revision()
+
+	 writefile("testfile", "left\nancestor")
+	 check(mtn("attr", "set", "attrfile", "my other car", "made of meat"),
+	       0, nil, nil)
+	 commit()
+	 left = base_revision()
+
+	 revert_to(anc)
+	 remove("_MTN.old")
+	 writefile("testfile", "ancestor\nright")
+	 commit()
+	 right = base_revision()
+
+	 check(mtn("merge_into_workspace", left), 0, false, false)
+	 chdir("..")
+      end,
+   checker = function (dir, refdir) end
+}
============================================================
--- ChangeLog	f9e96bcb4c8ab542d86cf9759887c94cefadbc09
+++ ChangeLog	8f4658ef76ca4a493fca7535ac9efcd46330b305
@@ -1,7 +1,8 @@ 2007-02-09  Zack Weinberg  <address@hidden
 2007-02-09  Zack Weinberg  <address@hidden>
 
 	* tests/workspace_migration: Generalize to support different sorts
-	of migration-needing workspaces.
+	of migration-needing workspaces.  Add new "inodeprints" and
+	"twoparent" tests.
 
 	* cmd_list.cc (ls_known, ls_changed): Work in a two-parent workspace.
 	* tests/two_parent_workspace_list: New test.
============================================================
--- tests/workspace_migration/__driver__.lua	7bbb0ae37bd598e625f2df0f6e5c11c46364855c
+++ tests/workspace_migration/__driver__.lua	e3b4942919d5e99c74ae0098986fa216d780bf40
@@ -43,6 +43,7 @@ local workspace_sets = { 
 local workspace_sets = { 
    "basic",
    "inodeprints",
+   "twoparent"
 }
 
 function check_workspace_matches_current(dir, refdir)