equal
deleted
inserted
replaced
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
131 do not process $Id: |
131 do not process $Id: |
132 xxx $ |
132 xxx $ |
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
133 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
134 tests for different changenodes |
134 tests for different changenodes |
135 % record |
135 % record chunk |
136 diff --git a/a b/a |
136 diff --git a/a b/a |
137 2 hunks, 2 lines changed |
137 2 hunks, 2 lines changed |
138 examine changes to 'a'? [Ynsfdaq?] |
138 examine changes to 'a'? [Ynsfdaq?] |
139 @@ -1,3 +1,4 @@ |
139 @@ -1,3 +1,4 @@ |
140 expand $Id$ |
140 expand $Id$ |
161 @@ -2,3 +2,4 @@ |
161 @@ -2,3 +2,4 @@ |
162 foo |
162 foo |
163 do not process $Id: |
163 do not process $Id: |
164 xxx $ |
164 xxx $ |
165 +bar |
165 +bar |
|
166 rolling back to revision 2 (undo commit) |
|
167 % record file |
|
168 diff --git a/a b/a |
|
169 2 hunks, 2 lines changed |
|
170 examine changes to 'a'? [Ynsfdaq?] |
|
171 @@ -1,3 +1,4 @@ |
|
172 expand $Id$ |
|
173 +foo |
|
174 do not process $Id: |
|
175 xxx $ |
|
176 record change 1/2 to 'a'? [Ynsfdaq?] |
|
177 @@ -2,2 +3,3 @@ |
|
178 do not process $Id: |
|
179 xxx $ |
|
180 +bar |
|
181 record change 2/2 to 'a'? [Ynsfdaq?] |
|
182 % a should be clean |
|
183 C a |
166 rolling back to revision 2 (undo commit) |
184 rolling back to revision 2 (undo commit) |
167 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 % init --mq |
186 % init --mq |
169 % qimport |
187 % qimport |
170 % commit --mq |
188 % commit --mq |