# 
# 
# add_file "tests/t_pivot_root_revert.at"
#  content [bf2c402b7cb49ebdd178928ea01372deb68858a5]
# 
# patch "tests/t_pivot_root.at"
#  from [17b5316361868011aa957a6e8a2c1e37ea0c4767]
#    to [2bf3634c3c1a16c375a85bc5f403992422cdfc8b]
# 
# patch "testsuite.at"
#  from [cebad0172359c26b8afa12d9e315df4b2147f1c5]
#    to [fb520b91b69e64420a86ee9c4492d8dc337ae842]
# 
============================================================
--- tests/t_pivot_root_revert.at	bf2c402b7cb49ebdd178928ea01372deb68858a5
+++ tests/t_pivot_root_revert.at	bf2c402b7cb49ebdd178928ea01372deb68858a5
@@ -0,0 +1,47 @@
+AT_SETUP([reverting a pivot_root])
+MONOTONE_SETUP
+
+# This test is a bug report
+# I think the problem is just generally that revert does not do a good
+# job cleaning up after renames?
+AT_XFAIL_IF(true)
+
+AT_CHECK(mkdir workspace)
+AT_CHECK(cd workspace/ && MONOTONE setup . -b testbranch, [], [ignore], [ignore])
+
+AT_CHECK(mkdir workspace/dir1)
+AT_CHECK(mkdir workspace/dir1/dir2)
+AT_DATA(workspace/dir1/file1, [blah blah
+])
+AT_CHECK(mkdir workspace/dir3)
+AT_CHECK(mkdir workspace/dir3/MT)
+AT_CHECK(cd workspace/ && MONOTONE add ., [], [ignore], [ignore])
+
+AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore])
+
+AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore])
+
+AT_CHECK(test -d workspace/MT)
+AT_CHECK(test -d workspace/dir2)
+AT_CHECK(test -f workspace/file1)
+AT_CHECK(test -d workspace/old_root)
+AT_CHECK(test -d workspace/old_root/dir3)
+AT_CHECK(test -d workspace/old_root/dir3/MT)
+
+AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], [])
+AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], [])
+
+AT_CHECK(cd workspace/ && MONOTONE revert ., [], [ignore], [ignore])
+
+AT_CHECK(test -d workspace/MT)
+AT_CHECK(test -d workspace/dir1)
+AT_CHECK(test -d workspace/dir1/dir2)
+AT_CHECK(test -f workspace/dir1/file1)
+AT_CHECK(test -d workspace/dir3)
+AT_CHECK(test -d workspace/dir3/MT)
+
+AT_CHECK(cd workspace/ && MONOTONE ls changed, [], [], [])
+AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], [])
+AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], [])
+
+AT_CLEANUP
============================================================
--- tests/t_pivot_root.at	17b5316361868011aa957a6e8a2c1e37ea0c4767
+++ tests/t_pivot_root.at	2bf3634c3c1a16c375a85bc5f403992422cdfc8b
@@ -1,4 +1,4 @@
-AT_SETUP([pivot_root, revert and commit])
+AT_SETUP([pivot_root])
 MONOTONE_SETUP
 
 # possible problems:
@@ -33,6 +33,7 @@
 
 AT_CHECK(cd workspace/ && MONOTONE ls changed, [], [], [])
 AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], [])
+AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], [])
 
 AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore])
 
@@ -43,28 +44,9 @@
 AT_CHECK(test -d workspace/old_root/dir3)
 AT_CHECK(test -d workspace/old_root/dir3/MT)
 
-AT_CHECK(cd workspace/ && MONOTONE revert ., [], [ignore], [ignore])
-
-AT_CHECK(test -d workspace/MT)
-AT_CHECK(test -d workspace/dir1)
-AT_CHECK(test -d workspace/dir1/dir2)
-AT_CHECK(test -f workspace/dir1/file1)
-AT_CHECK(test -d workspace/dir3)
-AT_CHECK(test -d workspace/dir3/MT)
-AT_CHECK(test ! -d workspace/MT/tmp)
-
-AT_CHECK(cd workspace/ && MONOTONE ls changed, [], [], [])
 AT_CHECK(cd workspace/ && MONOTONE ls missing, [], [], [])
+AT_CHECK(cd workspace/ && MONOTONE ls unknown, [], [], [])
 
-AT_CHECK(cd workspace/ && MONOTONE pivot_root --execute dir1 old_root, [], [ignore], [ignore])
-
-AT_CHECK(test -d workspace/MT)
-AT_CHECK(test -d workspace/dir2)
-AT_CHECK(test -f workspace/file1)
-AT_CHECK(test -d workspace/old_root)
-AT_CHECK(test -d workspace/old_root/dir3)
-AT_CHECK(test -d workspace/old_root/dir3/MT)
-
 AT_CHECK(cd workspace/ && MONOTONE commit -m foo, [], [ignore], [ignore])
 
 AT_CLEANUP
============================================================
--- testsuite.at	cebad0172359c26b8afa12d9e315df4b2147f1c5
+++ testsuite.at	fb520b91b69e64420a86ee9c4492d8dc337ae842
@@ -781,3 +781,4 @@
 m4_include(tests/t_log_to_file.at)
 m4_include(tests/t_log_selectors.at)
 m4_include(tests/t_pivot_root.at)
+m4_include(tests/t_pivot_root_revert.at)