diff tests/test-graft.t @ 22305:bdc0e04df243

merge with stable

--- a/tests/test-graft.t	Sat Aug 23 21:23:02 2014 +0900
+++ b/tests/test-graft.t	Wed Aug 27 18:35:34 2014 +0200
@@ -678,3 +678,14 @@
   grafting revision 28
   $ cat a
   abc
+
+Continue testing same origin policy, using revision numbers from test above
+but do some destructive editing of the repo:
+
+  $ hg up -qC 7
+  $ hg tag -l -r 13 tmp
+  $ hg --config extensions.mq= strip 2
+  saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob)
+  $ hg graft tmp
+  skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)
+  [255]