Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 150591 | Differences between
and this patch

Collapse All | Expand All

(-)patchdata/bug150591_cr_cr_cr/context_cr.patched.txt (+27 lines)
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]
(-)patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties (+4 lines)
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
patchFile=patch.txt
2 
contextFile=context_crlf.txt
3 
expectedResultFile=context_crlf.patched.txt
(-)patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt (+25 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]
(-)patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties (+4 lines)
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
patchFile=patch.txt
2 
contextFile=context_lf.txt
3 
expectedResultFile=context_lf.patched.txt
(-)patchdata/bug150591_cr_cr_cr/context_cr.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_crlf_lf_crlf/context_crlf.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_lf_crlf_lf/context_lf.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_lf_lf_lf/patchConfiguration.properties (+3 lines)
Added Link Here
1 
patchFile=patch_lf.txt
2 
contextFile=context_lf.txt
3 
expectedResultFile=context_lf.patched.txt
(-)patchdata/bug150591_lf_lf_lf/context_lf.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_cr_cr_cr/patchConfiguration.properties (+10 lines)
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
--- old.txt	2005-05-07 00:16:20.000000000 +0200
Added Link Here
1 
# Single CR character is ignored in LineReader for the patch file
2 
#(see org.eclipse.compare.internal.core.patch.PatchReader.parse(BufferedReader)
3 
# line 97) This results in reading the patch as a single line and ending up with
4 
# an invalid patch format. Skip the test.
5 
skipTest=true
6 
patchFile=patch_cr.txt
7 
contextFile=context_cr.txt
8 
expectedResultFile=context_cr.patched.txt
(-)patchdata/bug150591_lf_lf_lf/context_lf.patched.txt (+25 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]
(-)patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties (+3 lines)
Added Link Here
1 
patchFile=patch_lf.txt
2 
contextFile=context_crlf.txt
3 
expectedResultFile=context_crlf.patched.txt
(-)patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt (+25 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]
(-)patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties (+3 lines)
Added Link Here
1 
patchFile=patch.txt
2 
contextFile=context_cr.txt
3 
expectedResultFile=context_cr.patched.txt
(-)patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt (+25 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]
(-)patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_cr_crlf_cr/context_cr.txt (+23 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[d]
5 
[e]
6 
[f]
7 
[g]
8 
[h]
9 
[i]
10 
[j]
11 
[k]
12 
[l]
13 
[m]
14 
[n]
15 
[o]
16 
[p]
17 
[q]
18 
[r]
19 
[s]
20 
[t]
21 
[u]
22 
[v]
23 
[w]
(-)patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt (+25 lines)
Added Link Here
1 
[a]
2 
[b]
3 
[c]
4 
[c1]
5 
[c2]
6 
[d]
7 
[e]
8 
[f]
9 
[g]
10 
[h]
11 
[i1]
12 
[j]
13 
[k]
14 
[l]
15 
[m]
16 
[n]
17 
[p]
18 
[q]
19 
[r]
20 
[s]
21 
[s1]
22 
[t]
23 
[u]
24 
[v]
25 
[w]

Return to bug 150591