# HG changeset patch # User Christian Ebert # Date 1273850138 -7200 # Node ID 491c3fc0f551fd71ecb851639defd4d47bd91423 # Parent 9f46c562c4b5dd35a612162b027174d8c3384ac5# Parent bceb04857ce198f7466be6db9ae8ab2c4d6a465d Merge with stable diff -r 9f46c562c4b5 -r 491c3fc0f551 tests/test-keyword.out --- a/tests/test-keyword.out Sun May 09 11:14:43 2010 +0200 +++ b/tests/test-keyword.out Fri May 14 17:15:38 2010 +0200 @@ -163,7 +163,7 @@ do not process $Id: xxx $ +bar -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % init --mq % qimport @@ -462,7 +462,6 @@ % test restricted mode with transplant -b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved marked working directory as branch foo -created new head 2 files updated, 0 files merged, 0 files removed, 0 files unresolved applying 4aa30d025d50 4aa30d025d50 transplanted to 5a4da427c162