Show More
@@ -935,7 +935,7 b' def absorb(ui, repo, stack=None, targetc' | |||
|
935 | 935 | if opts.get('interactive'): |
|
936 | 936 | diff = patch.diff(repo, stack[-1].node(), targetctx.node(), matcher) |
|
937 | 937 | origchunks = patch.parsepatch(diff) |
|
938 | chunks = cmdutil.recordfilter(ui, origchunks)[0] | |
|
938 | chunks = cmdutil.recordfilter(ui, origchunks, matcher)[0] | |
|
939 | 939 | targetctx = overlaydiffcontext(stack[-1], chunks) |
|
940 | 940 | fm = None |
|
941 | 941 | if opts.get('print_changes') or not opts.get('apply_changes'): |
@@ -399,6 +399,23 b' Executable files:' | |||
|
399 | 399 | |
|
400 | 400 | 1 changesets affected |
|
401 | 401 | 99b4ae7 foo |
|
402 | $ hg absorb --dry-run --interactive --print-changes | |
|
403 | diff -r 99b4ae712f84 foo.py | |
|
404 | 1 hunks, 1 lines changed | |
|
405 | examine changes to 'foo.py'? [Ynesfdaq?] y | |
|
406 | ||
|
407 | @@ -1,1 +1,1 @@ | |
|
408 | - | |
|
409 | +bla | |
|
410 | record this change to 'foo.py'? [Ynesfdaq?] y | |
|
411 | ||
|
412 | showing changes for foo.py | |
|
413 | @@ -0,1 +0,1 @@ | |
|
414 | 99b4ae7 - | |
|
415 | 99b4ae7 +bla | |
|
416 | ||
|
417 | 1 changesets affected | |
|
418 | 99b4ae7 foo | |
|
402 | 419 | $ hg absorb --apply-changes |
|
403 | 420 | 1 of 1 chunk(s) applied |
|
404 | 421 | $ hg diff -c . |
General Comments 0
You need to be logged in to leave comments.
Login now