# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1303759244 -7200
# Node ID bcff4759d17dc7d6eec967b4ec2d7d12cde22cf7
# Parent  da65edcac72af707922917d912ae1969495206d0# Parent  b247123d71f6362b5ef8c24d0aceb50993f26a0b
merge with stable

diff -r da65edcac72a -r bcff4759d17d tests/test-transplant.t
--- a/tests/test-transplant.t	Sun Apr 24 17:30:50 2011 -0400
+++ b/tests/test-transplant.t	Mon Apr 25 21:20:44 2011 +0200
@@ -397,12 +397,13 @@
   $ echo '[patch]' >> .hg/hgrc
   $ echo 'eol = crlf' >> .hg/hgrc
   $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
-  $ hg ci -m addb
-  nothing changed
-  [1]
+  $ hg ci -Am addb
+  adding b
   $ hg transplant -s ../twin1 tip
+  searching for changes
+  warning: repository is unrelated
   applying 2e849d776c17
-  2e849d776c17 transplanted to 589cea8ba85b
+  2e849d776c17 transplanted to 8e65bebc063e
   $ cat b
   a\r (esc)
   b\r (esc)