Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Mon Mar 6 17:40:19 2006 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

1. Folders compared

#	Location	Folder
1	C:\Merge Test Files\4.0.6\catalina\src\share\org\apache\catalina\	connector
2	C:\Merge Test Files\4.1.18\catalina\src\share\org\apache\catalina\	connector
3	C:\Merge Test Files\4.1.24\catalina\src\share\org\apache\catalina\	connector
Note: Merge considers the second folder to be the common ancestor of the others.

2. Summary for all files

Between Folders 1 and 2	Between Folders 2 and 3	Between Folders 1 and 3	Relative to Common Ancestor
416 lines in 6 pairs of unchanged files	11548 lines in 16 pairs of unchanged files	416 lines in 6 pairs of unchanged files	6 unchanged files
13297 lines in 8 pairs of changed files	2570 lines in 1 pair of changed files	13297 lines in 8 pairs of changed files	11 changed files
77 lines in 3 inserted files	191 lines in 1 inserted file	268 lines in 4 inserted files	4 inserted files
809 lines in 3 removed files	No removed files	809 lines in 3 removed files	0 removed files

Description	Between Folders 1 and 2		Between Folders 2 and 3		Between Folders 1 and 3
Description	Lines	Text Blocks	Lines	Text Blocks	Lines	Text Blocks
Unchanged	6669	80	7058	18	6669	80
Changed	186	31	2	1	186	31
Inserted	259	35	191	1	991	35
Removed	816	7	0	0	275	8

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison method	Files smaller than 512 KB are compared using the configured comparison rules to determine whether they are identical. For larger files, a faster byte-by-byte comparison is performed
Depth	All files in the folder hierarchy are compared
Whitespace	All differences in whitespace within lines are ignored
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
Include	Items matching `Files & Folders - *` are included in the comparison
Unchanged files	Shown in the comparison detail
Timestamps and sizes	Not shown in the comparison detail
Change counts	Shown in the comparison detail

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

http	0	http	0	http	0
DefaultHeaders.java	2	DefaultHeaders.java	0	DefaultHeaders.java	2	Report 1
HttpConnector.java	17	HttpConnector.java	0	HttpConnector.java	17	Report 2
HttpProcessor.java	18	HttpProcessor.java	1	HttpProcessor.java	18	Report 3
		LocalString_fr.properties	0	LocalString_fr.properties	1	Report 4
LocalStrings.properties	0	LocalStrings.properties	0	LocalStrings.properties	0
LocalStrings_es.properties	0	LocalStrings_es.properties	0	LocalStrings_es.properties	0
SocketInputStream.java	2	SocketInputStream.java	0	SocketInputStream.java	2	Report 5
http10	0	http10	0	http10	0
warp	0
Constants.java	1					Report 6
WarpResponse.java	1					Report 7
WarpSSLData.java	1					Report 8
Constants.java	4	Constants.java	0	Constants.java	4	Report 9
HttpConnector.java	10	HttpConnector.java	0	HttpConnector.java	10	Report 10
HttpProcessor.java	6	HttpProcessor.java	0	HttpProcessor.java	6	Report 11
LocalStrings.properties	0	LocalStrings.properties	0	LocalStrings.properties	0
		LocalStrings_fr.properties	0	LocalStrings_fr.properties	1	Report 12
LocalStrings_ja.properties	0	LocalStrings_ja.properties	0	LocalStrings_ja.properties	0
				ClientAbortException.java	1	Report 13
Constants.java	0	Constants.java	0	Constants.java	0
HttpRequestBase.java	8	HttpRequestBase.java	0	HttpRequestBase.java	8	Report 14
LocalStrings.properties	0	LocalStrings.properties	0	LocalStrings.properties	0
		LocalStrings_fr.properties	0	LocalStrings_fr.properties	1	Report 15