Mercurial > hg
comparison tests/test-record.out @ 11728:226a328a7ff3
record: count lines changed as the number of lines added or removed
per "record" hunk
Record deals in hunks which are tighter than traditional patch hunks,
really only a single run of additions/removals. Another addition, even a
line after a fixed line is treated as a new hunk by record.
author | timeless <timeless@gmail.com> |
---|---|
date | Thu, 22 Jul 2010 18:47:46 +0300 |
parents | 40c06bbf58be |
children |
comparison
equal
deleted
inserted
replaced
11726:b6f72d8d77ae | 11728:226a328a7ff3 |
---|---|
220 +7264f99c5f5ff3261504828afa4fb4d406c3af54 | 220 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
221 \ No newline at end of file | 221 \ No newline at end of file |
222 record this change to 'plain'? [Ynsfdaq?] | 222 record this change to 'plain'? [Ynsfdaq?] |
223 % modify end of plain file, add EOL | 223 % modify end of plain file, add EOL |
224 diff --git a/plain b/plain | 224 diff --git a/plain b/plain |
225 1 hunks, 2 lines changed | 225 1 hunks, 1 lines changed |
226 examine changes to 'plain'? [Ynsfdaq?] | 226 examine changes to 'plain'? [Ynsfdaq?] |
227 @@ -9,4 +9,4 @@ | 227 @@ -9,4 +9,4 @@ |
228 9 | 228 9 |
229 10 | 229 10 |
230 11 | 230 11 |
232 \ No newline at end of file | 232 \ No newline at end of file |
233 +7264f99c5f5ff3261504828afa4fb4d406c3af54 | 233 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
234 record this change to 'plain'? [Ynsfdaq?] | 234 record this change to 'plain'? [Ynsfdaq?] |
235 % modify beginning, trim end, record both | 235 % modify beginning, trim end, record both |
236 diff --git a/plain b/plain | 236 diff --git a/plain b/plain |
237 2 hunks, 4 lines changed | 237 2 hunks, 3 lines changed |
238 examine changes to 'plain'? [Ynsfdaq?] | 238 examine changes to 'plain'? [Ynsfdaq?] |
239 @@ -1,4 +1,4 @@ | 239 @@ -1,4 +1,4 @@ |
240 -1 | 240 -1 |
241 +2 | 241 +2 |
242 2 | 242 2 |
274 -7264f99c5f5ff3261504828afa4fb4d406c3af54 | 274 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
275 | 275 |
276 % trim beginning, modify end | 276 % trim beginning, modify end |
277 % record end | 277 % record end |
278 diff --git a/plain b/plain | 278 diff --git a/plain b/plain |
279 2 hunks, 5 lines changed | 279 2 hunks, 4 lines changed |
280 examine changes to 'plain'? [Ynsfdaq?] | 280 examine changes to 'plain'? [Ynsfdaq?] |
281 @@ -1,9 +1,6 @@ | 281 @@ -1,9 +1,6 @@ |
282 -2 | 282 -2 |
283 -2 | 283 -2 |
284 -3 | 284 -3 |