--- a/tests/test-annotate
+++ b/tests/test-annotate
@@ -74,3 +74,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
+

--- a/tests/test-annotate.out
+++ b/tests/test-annotate.out
@@ -52,3 +52,6 @@ 7 b: d
 0: a
 1: a
 1: a
+% generate ABA rename configuration
+% annotate after ABA with follow
+foo: foo