# HG changeset patch # User Matt Mackall # Date 1273849269 18000 # Node ID 4c37b26c549c47c0aadc378e57d0db8f3e20630f # Parent 0970d7c7ff423e499d11761a0fc8ac21923c4cd9 rollback: fix up tests [ original upstream message ] diff -r 0970d7c7ff42 -r 4c37b26c549c tests/test-keyword.out --- a/tests/test-keyword.out Sat Aug 14 09:42:14 2010 +0100 +++ b/tests/test-keyword.out Fri May 14 10:01:09 2010 -0500 @@ -181,7 +181,7 @@ record change 2/2 to 'a'? [Ynsfdaq?] % a should be clean C a -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 @@ -255,7 +255,7 @@ +do not process $Id: +xxx $ % rollback -rolling back to revision 2 (undo commit) +rolling back to revision 1 (undo commit) % status A c % update -C @@ -323,7 +323,7 @@ % status ? c % rollback -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) % status R a ? c @@ -376,7 +376,7 @@ ignore $Id$ % rollback -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) % clean update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % kwexpand/kwshrink on selected files