# 
# patch "tests/t_annotate_renames.at"
#  from [d4e5bae99ae78d94c788825c3507a0f9cfb5de32]
#    to [d87797cbda3513789cc18f756eb61ff8b79eb1c5]
# 
========================================================================
--- tests/t_annotate_renames.at	d4e5bae99ae78d94c788825c3507a0f9cfb5de32
+++ tests/t_annotate_renames.at	d87797cbda3513789cc18f756eb61ff8b79eb1c5
@@ -1,9 +1,6 @@
 AT_SETUP([annotate file whose name changed])
 MONOTONE_SETUP
 
-# This test is a bug report
-AT_XFAIL_IF(true)
-
 ADD_FILE(foo, [a
 b
 c
@@ -14,11 +11,6 @@
 x
 ])
 
-AT_DATA(foo.merged, [aa
-b
-x
-])
-
 COMMIT(testbranch)
 REV0=`BASE_REVISION`
 
@@ -43,13 +35,13 @@
 
 #
 # annotate foo should now be
-# REV1: aa
+# REV0: a
 # REV0: b
 # REVR: x
 #
 
 AT_CHECK(MONOTONE annotate foo.new, [], [stdout], [ignore])
-AT_CHECK(head -n 1 stdout | grep $REV1, [0], [ignore], [ignore])
+AT_CHECK(head -n 1 stdout | grep $REV0, [0], [ignore], [ignore])
 AT_CHECK(head -n 2 stdout | TAIL(1) | grep $REV0, [0], [ignore], [ignore])
 AT_CHECK(head -n 3 stdout | TAIL(1) | grep $REVR, [0], [ignore], [ignore])