Mercurial > vim

annotate src/testdir/dumps/Test_diff_overlapped_3.21.dump @ 36194:7a610da15ac3 v9.1.0743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0743: diff mode does not handle overlapping diffs correctly Commit: https://github.com/vim/vim/commit/06fe70c183a53ea97cd42ace490d4fb9fd14f042 Author: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com> Date: Thu Sep 26 16:19:42 2024 +0200 patch 9.1.0743: diff mode does not handle overlapping diffs correctly Problem: diff mode does not handle overlapping diffs correctly Solution: correct the logic to handle overlapping blocks (Yukihiro Nakadaira) Vim merges overlapped diff blocks and it doesn't work expectedly in some situation. closes: #15735 Signed-off-by: Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 26 Sep 2024 16:30:42 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
36194
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
1 | +0#0000e05#a8a8a8255@1|a+2#0000000#ff404010| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1|x+2#0000000#ff404010| +0&#ffd7ff255@20||+1&#ffffff0| +0#0000e05#a8a8a8255@1|y+2#0000000#ff404010| +0&#ffd7ff255@20
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
2 | +0#0000e05#a8a8a8255@1|b+2#0000000#ff404010| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1|b+2#0000000#ff404010| +0&#ffd7ff255@20||+1&#ffffff0| +0#0000e05#a8a8a8255@1|y+2#0000000#ff404010| +0&#ffd7ff255@20
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
3 | +0#0000e05#a8a8a8255@1|c+2#0000000#ff404010| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1|x+2#0000000#ff404010| +0&#ffd7ff255@20||+1&#ffffff0| +0#0000e05#a8a8a8255@1|y+2#0000000#ff404010| +0&#ffd7ff255@20
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
4 | +0#0000e05#a8a8a8255@1|d+2#0000000#ff404010| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1|d+2#0000000#ff404010| +0&#ffd7ff255@20||+1&#ffffff0| +0#0000e05#a8a8a8255@1|y+2#0000000#ff404010| +0&#ffd7ff255@20
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
5 |~+0#4040ff13#ffffff0| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
6 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
7 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
8 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
9 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
10 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
11 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
12 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
13 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
14 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
15 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
16 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
17 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
18 |~| @23||+1#0000000&|~+0#4040ff13&| @22||+1#0000000&|~+0#4040ff13&| @22
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
19 |X+3#0000000&|d|i|f|i|l|e|1| @4|1|,|1| @5|A|l@1| |X+1&&|d|i|f|i|l|e|2| @3|1|,|1| @5|A|l@1| |X|d|i|f|i|l|e|3| @3|1|,|1| @5|A|l@1
7a610da15ac3 patch 9.1.0743: diff mode does not handle overlapping diffs correctly
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
20 |:+0&&> @73