# 
# 
# add_file "tests/t_disapprove_branch.at"
#  content [c7713fd20baddf08f994f8f778ce259c78e83b62]
# 
# patch "ChangeLog"
#  from [34d6d456a7e3e26048fa89a62ba3d42fdc4cdc20]
#    to [65ec4cc540866c8534344697a1c10d0f6fff5cae]
# 
============================================================
--- tests/t_disapprove_branch.at	c7713fd20baddf08f994f8f778ce259c78e83b62
+++ tests/t_disapprove_branch.at	c7713fd20baddf08f994f8f778ce259c78e83b62
@@ -0,0 +1,19 @@
+AT_SETUP([branch handling in disapprove])
+MONOTONE_SETUP
+
+# 1) if no --branch is specified, disapprove should use the branch
+#    cert on the rev being disapproved.  if there are multiple such
+#    certs, it should fail.  the working copy's branch (if any) is
+#    irrelevant.
+# 2) if --branch is specified, dispprove should use the branch given,
+#    and ignore the branch cert on the rev being disapproved.
+
+# This test is a bug report.
+AT_XFAIL_IF(true)
+
+# From reading the disapprove code; this is obviously broken.  I don't
+# have time to write a real test right now.  So this is a todo to even
+# write the bug report...
+AT_CHECK(true)
+
+AT_CLEANUP
============================================================
--- ChangeLog	34d6d456a7e3e26048fa89a62ba3d42fdc4cdc20
+++ ChangeLog	65ec4cc540866c8534344697a1c10d0f6fff5cae
@@ -1,5 +1,9 @@
 2006-03-08  Nathaniel Smith  <address@hidden>
 
+	* tests/t_disapprove_branch.at: Actually add.
+
+2006-03-08  Nathaniel Smith  <address@hidden>
+
 	* tests/t_disapprove_branch.at, testsuite.at: Add a placeholder
 	test for disapprove's broken branch handling; from code
 	inspection, it is obviously broken.  I don't have time to write a