--- a/tests/test-ready.t	Fri Jul 01 14:55:02 2011 +0200
+++ b/tests/test-ready.t	Fri Jul 01 16:00:19 2011 +0200
@@ -143,4 +143,50 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag babar for changeset cdaaa31e4239
   
+Check rollback
 
+  $ hg merge
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg commit -m 'merge'
+  $ hg published tip
+  $ hg log -r 'publishedheads()'
+  changeset:   7:26631d82e09e
+  tag:         tip
+  parent:      6:bd66bf1525ee
+  parent:      5:cdaaa31e4239
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merge
+  
+test rollback does not mess up the liquid changeset
+  $ mkcommit bibi
+  $ hg rollback
+  repository tip rolled back to revision 7 (undo commit)
+  working directory now based on revision 7
+  $ hg log -r 'publishedheads()'
+  changeset:   7:26631d82e09e
+  tag:         tip
+  parent:      6:bd66bf1525ee
+  parent:      5:cdaaa31e4239
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merge
+  
+
+test rollback even when rollbacking frozen
+
+  $ mkcommit bubu
+  $ hg published tip
+  $ hg rollback
+  repository tip rolled back to revision 7 (undo commit)
+  working directory now based on revision 7
+  $ hg log -r 'publishedheads()'
+  changeset:   7:26631d82e09e
+  tag:         tip
+  parent:      6:bd66bf1525ee
+  parent:      5:cdaaa31e4239
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     merge
+