diff -r b8234da61635 -r c5badbf855db tests/test-keyword.out --- a/tests/test-keyword.out Wed Jun 09 17:21:12 2010 +0100 +++ b/tests/test-keyword.out Tue Jun 01 01:05:45 2010 +0200 @@ -132,7 +132,7 @@ xxx $ $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ tests for different changenodes -% record +% record chunk diff --git a/a b/a 2 hunks, 2 lines changed examine changes to 'a'? [Ynsfdaq?] @@ -164,6 +164,24 @@ xxx $ +bar rolling back to revision 2 (undo commit) +% record file +diff --git a/a b/a +2 hunks, 2 lines changed +examine changes to 'a'? [Ynsfdaq?] +@@ -1,3 +1,4 @@ + expand $Id$ ++foo + do not process $Id: + xxx $ +record change 1/2 to 'a'? [Ynsfdaq?] +@@ -2,2 +3,3 @@ + do not process $Id: + xxx $ ++bar +record change 2/2 to 'a'? [Ynsfdaq?] +% a should be clean +C a +rolling back to revision 2 (undo commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % init --mq % qimport