diff --git a/tests/test-annotate b/tests/test-annotate
--- a/tests/test-annotate
+++ b/tests/test-annotate
@@ -76,3 +76,19 @@ hg annotate -nf b
 
 echo % linkrev vs rev
 hg annotate -r tip a
+
+# test issue 589
+# annotate was crashing when trying to --follow something 
+# like A -> B -> A
+echo % generate ABA rename configuration
+echo foo > foo
+hg add foo
+hg ci -m addfoo
+hg rename foo bar
+hg ci -m renamefoo
+hg rename bar foo
+hg ci -m renamebar
+
+echo % annotate after ABA with follow
+hg annotate --follow foo
+