| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (2 lines) | |||
| M | tests/test-diff-change.t (3 lines) |
| { | { | ||||
| ( | ( | ||||
| b'ui', | b'ui', | ||||
| b'forcemerge', | b'forcemerge', | ||||
| ): b'internal:merge3-lie-about-conflicts', | ): b'internal:merge3-lie-about-conflicts', | ||||
| }, | }, | ||||
| b'diff --merge', | b'diff --merge', | ||||
| ): | ): | ||||
| repo.ui.pushbuffer() | |||||
| mergemod.merge(pctx2, wc=wctx) | mergemod.merge(pctx2, wc=wctx) | ||||
| repo.ui.popbuffer() | |||||
| ctx1 = wctx | ctx1 = wctx | ||||
| else: | else: | ||||
| ctx1 = ctx2.p1() | ctx1 = ctx2.p1() | ||||
| elif from_rev or to_rev: | elif from_rev or to_rev: | ||||
| repo = scmutil.unhidehashlikerevs( | repo = scmutil.unhidehashlikerevs( | ||||
| repo, [from_rev] + [to_rev], b'nowarn' | repo, [from_rev] + [to_rev], b'nowarn' | ||||
| ) | ) | ||||
| ctx1 = scmutil.revsingle(repo, from_rev, None) | ctx1 = scmutil.revsingle(repo, from_rev, None) | ||||
| -8 | -8 | ||||
| +y | +y | ||||
| 9 | 9 | ||||
| 10 | 10 | ||||
| merge diff should show only manual edits to a merge: | merge diff should show only manual edits to a merge: | ||||
| $ hg diff --merge -c 6 | $ hg diff --merge -c 6 | ||||
| merging file.txt | |||||
| (no diff output is expected here) | (no diff output is expected here) | ||||
| Construct an "evil merge" that does something other than just the merge. | Construct an "evil merge" that does something other than just the merge. | ||||
| $ hg co ".^" | $ hg co ".^" | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg merge -r 5 | $ hg merge -r 5 | ||||
| merging file.txt | merging file.txt | ||||
| +y | +y | ||||
| 9 | 9 | ||||
| 10 | 10 | ||||
| +11 | +11 | ||||
| Contrast with the `hg diff -c 7` version above: only the manual edit shows | Contrast with the `hg diff -c 7` version above: only the manual edit shows | ||||
| up, making it easy to identify changes someone is otherwise trying to sneak | up, making it easy to identify changes someone is otherwise trying to sneak | ||||
| into a merge. | into a merge. | ||||
| $ hg diff --merge -c 7 | $ hg diff --merge -c 7 | ||||
| merging file.txt | |||||
| diff -r 8ad85e839ba7 file.txt | diff -r 8ad85e839ba7 file.txt | ||||
| --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 | --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 | ||||
| +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 | +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 | ||||
| @@ -9,3 +9,4 @@ | @@ -9,3 +9,4 @@ | ||||
| y | y | ||||
| 9 | 9 | ||||
| 10 | 10 | ||||
| +11 | +11 | ||||
| $ hg diff --no-merge -c 11 | $ hg diff --no-merge -c 11 | ||||
| diff -r fd1f17c90d7c -r 5010caab09f6 new-file-p2.txt | diff -r fd1f17c90d7c -r 5010caab09f6 new-file-p2.txt | ||||
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
| +++ b/new-file-p2.txt Thu Jan 01 00:00:00 1970 +0000 | +++ b/new-file-p2.txt Thu Jan 01 00:00:00 1970 +0000 | ||||
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@ | ||||
| +this file is new in p2 of the merge | +this file is new in p2 of the merge | ||||
| With --merge, it's a diff against the conflicted content. | With --merge, it's a diff against the conflicted content. | ||||
| $ hg diff --merge -c 11 | $ hg diff --merge -c 11 | ||||
| merging file.txt | |||||
| diff -r 5010caab09f6 file.txt | diff -r 5010caab09f6 file.txt | ||||
| --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 | --- a/file.txt Thu Jan 01 00:00:00 1970 +0000 | ||||
| +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 | +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 | ||||
| @@ -6,12 +6,6 @@ | @@ -6,12 +6,6 @@ | ||||
| 5 | 5 | ||||
| 6 | 6 | ||||
| 7 | 7 | ||||
| -<<<<<<< local: fd1f17c90d7c - test: new file | -<<<<<<< local: fd1f17c90d7c - test: new file | ||||