Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 109644 Details for
Bug 150591
[Patch] Team -> Apply Patch and line endings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Test cases
patch_150591_tests_v02.txt (text/plain), 13.48 KB, created by
Tomasz Zarna
on 2008-08-11 06:51:50 EDT
(
hide
)
Description:
Test cases
Filename:
MIME Type:
Creator:
Tomasz Zarna
Created:
2008-08-11 06:51:50 EDT
Size:
13.48 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.compare.tests >Index: patchdata/bug150591_cr_crlf_cr/patch.txt >=================================================================== >RCS file: patchdata/bug150591_cr_crlf_cr/patch.txt >diff -N patchdata/bug150591_cr_crlf_cr/patch.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_crlf_cr/patch.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_lf_lf_lf/patch_lf.txt >=================================================================== >RCS file: patchdata/bug150591_lf_lf_lf/patch_lf.txt >diff -N patchdata/bug150591_lf_lf_lf/patch_lf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_lf_lf/patch_lf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_cr_cr_cr/context_cr.patched.txt >=================================================================== >RCS file: patchdata/bug150591_cr_cr_cr/context_cr.patched.txt >diff -N patchdata/bug150591_cr_cr_cr/context_cr.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_cr_cr/context_cr.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_crlf_crlf_crlf/patch.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_crlf_crlf/patch.txt >diff -N patchdata/bug150591_crlf_crlf_crlf/patch.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_crlf_crlf/patch.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties >diff -N patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,3 @@ >+patchFile=patch.txt >+contextFile=context_crlf.txt >+expectedResultFile=context_crlf.patched.txt >Index: patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt >=================================================================== >RCS file: patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt >diff -N patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_lf_crlf_lf/patch.txt >=================================================================== >RCS file: patchdata/bug150591_lf_crlf_lf/patch.txt >diff -N patchdata/bug150591_lf_crlf_lf/patch.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_crlf_lf/patch.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties >diff -N patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,3 @@ >+patchFile=patch.txt >+contextFile=context_lf.txt >+expectedResultFile=context_lf.patched.txt >Index: patchdata/bug150591_cr_cr_cr/context_cr.txt >=================================================================== >RCS file: patchdata/bug150591_cr_cr_cr/context_cr.txt >diff -N patchdata/bug150591_cr_cr_cr/context_cr.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_cr_cr/context_cr.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_crlf_lf_crlf/context_crlf.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_lf_crlf/context_crlf.txt >diff -N patchdata/bug150591_crlf_lf_crlf/context_crlf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_lf_crlf/context_crlf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_lf_crlf_lf/context_lf.txt >=================================================================== >RCS file: patchdata/bug150591_lf_crlf_lf/context_lf.txt >diff -N patchdata/bug150591_lf_crlf_lf/context_lf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_crlf_lf/context_lf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_lf_lf_lf/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_lf_lf_lf/patchConfiguration.properties >diff -N patchdata/bug150591_lf_lf_lf/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_lf_lf/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,3 @@ >+patchFile=patch_lf.txt >+contextFile=context_lf.txt >+expectedResultFile=context_lf.patched.txt >Index: patchdata/bug150591_lf_lf_lf/context_lf.txt >=================================================================== >RCS file: patchdata/bug150591_lf_lf_lf/context_lf.txt >diff -N patchdata/bug150591_lf_lf_lf/context_lf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_lf_lf/context_lf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_cr_cr_cr/patch_cr.txt >=================================================================== >RCS file: patchdata/bug150591_cr_cr_cr/patch_cr.txt >diff -N patchdata/bug150591_cr_cr_cr/patch_cr.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_cr_cr/patch_cr.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_crlf_lf_crlf/patch_lf.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_lf_crlf/patch_lf.txt >diff -N patchdata/bug150591_crlf_lf_crlf/patch_lf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_lf_crlf/patch_lf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,20 @@ >+--- old.txt 2005-05-07 00:16:20.000000000 +0200 >++++ new.txt 2005-05-07 00:16:32.000000000 +0200 >+@@ -3,2 +3,4 @@ >+ [c] >++[c1] >++[c2] >+ [d] >+@@ -8,3 +10,3 @@ >+ [h] >+-[i] >++[i1] >+ [j] >+@@ -14,3 +16,2 @@ >+ [n] >+-[o] >+ [p] >+@@ -19,2 +20,3 @@ >+ [s] >++[s1] >+ [t] >Index: patchdata/bug150591_cr_cr_cr/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_cr_cr_cr/patchConfiguration.properties >diff -N patchdata/bug150591_cr_cr_cr/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_cr_cr/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,8 @@ >+# Single CR character is ignored in LineReader for the patch file >+#(see org.eclipse.compare.internal.core.patch.PatchReader.parse(BufferedReader) >+# line 97) This results in reading the patch as a single line and ending up with >+# an invalid patch format. Skip the test. >+skipTest=true >+patchFile=patch_cr.txt >+contextFile=context_cr.txt >+expectedResultFile=context_cr.patched.txt >Index: patchdata/bug150591_lf_lf_lf/context_lf.patched.txt >=================================================================== >RCS file: patchdata/bug150591_lf_lf_lf/context_lf.patched.txt >diff -N patchdata/bug150591_lf_lf_lf/context_lf.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_lf_lf_lf/context_lf.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties >diff -N patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,3 @@ >+patchFile=patch_lf.txt >+contextFile=context_crlf.txt >+expectedResultFile=context_crlf.patched.txt >Index: patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt >diff -N patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties >=================================================================== >RCS file: patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties >diff -N patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,3 @@ >+patchFile=patch.txt >+contextFile=context_cr.txt >+expectedResultFile=context_cr.patched.txt >Index: patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt >=================================================================== >RCS file: patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt >diff -N patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt >diff -N patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_cr_crlf_cr/context_cr.txt >=================================================================== >RCS file: patchdata/bug150591_cr_crlf_cr/context_cr.txt >diff -N patchdata/bug150591_cr_crlf_cr/context_cr.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_cr_crlf_cr/context_cr.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,23 @@ >+[a] >+[b] >+[c] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i] >+[j] >+[k] >+[l] >+[m] >+[n] >+[o] >+[p] >+[q] >+[r] >+[s] >+[t] >+[u] >+[v] >+[w] >Index: patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt >=================================================================== >RCS file: patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt >diff -N patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,25 @@ >+[a] >+[b] >+[c] >+[c1] >+[c2] >+[d] >+[e] >+[f] >+[g] >+[h] >+[i1] >+[j] >+[k] >+[l] >+[m] >+[n] >+[p] >+[q] >+[r] >+[s] >+[s1] >+[t] >+[u] >+[v] >+[w]
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 150591
:
78544
|
89918
| 109644 |
109645
|
109646
|
113741
|
120188