equal
deleted
inserted
replaced
275 consumefile() |
275 consumefile() |
276 continue |
276 continue |
277 seen[hdr] = True |
277 seen[hdr] = True |
278 if resp_all[0] is None: |
278 if resp_all[0] is None: |
279 chunk.pretty(ui) |
279 chunk.pretty(ui) |
280 r = prompt(_('record changes to %s?') % |
280 r = prompt(_('examine changes to %s?') % |
281 _(' and ').join(map(repr, chunk.files()))) |
281 _(' and ').join(map(repr, chunk.files()))) |
282 if r == 'y': |
282 if r == 'y': |
283 applied[chunk.filename()] = [chunk] |
283 applied[chunk.filename()] = [chunk] |
284 if chunk.allhunks(): |
284 if chunk.allhunks(): |
285 applied[chunk.filename()] += consumefile() |
285 applied[chunk.filename()] += consumefile() |