diff tests/test-relink.t @ 13659:a73f38d8bbdb

merge with stable

--- a/tests/test-relink.t	Wed Mar 16 13:51:47 2011 +0100
+++ b/tests/test-relink.t	Wed Mar 16 16:07:06 2011 +0100
@@ -36,6 +36,13 @@
   $ cat $TESTDIR/binfile.bin >> b
   $ hg ci -m anotherchange
 
+don't sit forever trying to double-lock the source repo
+
+  $ hg relink .
+  relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store
+  there is nothing to relink
+
+
 Test files are read in binary mode
 
   $ python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')"