test: comparison tests/test-keyword.out

equal deleted inserted replaced

-:0970d7c7ff42
+:4c37b26c549c
 xxx $
 +bar
 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
 % commit --mq
 % keywords should not be expanded in patch
 @@ -0,0 +1,3 @@
 +expand $Id$
 +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
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % custom keyword expansion
 % remove
 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
 % status
 ? c
 % rollback
-rolling back to revision 3 (undo commit)
+rolling back to revision 2 (undo commit)
 % status
 R a
 ? c
 % revert a
 % cat a
 xxx $
 $Xinfo: User Name <user@example.com>: rejects? $
 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
 % copy a x/a
 % kwexpand a