Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon Jan 24 00:12:01 2005 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 Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1. Files compared

# Location File Last Modified
1 e:\tech\cvs\coppermine\stable-head\sql basic.sql Sat Sep 4 20:19:17 2004 UTC
2 e:\tech\cvs\coppermine\stable\sql basic.sql Sun Jan 23 23:30:55 2005 UTC

2. Comparison summary

Description Between
Files 1 and 2
Blocks Lines
Unchanged 2 173
Changed 0 0
Inserted 1 7
Removed 0 0

3. Comparison options

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
CR/LF characters Hidden in comparison detail

4. Active regular expressions

No regular expressions were active.

5. Comparison detail

1   # $Id: basic.sql,v 1.6 2004/09/04 20:19:17 kegobeer Exp $   1   # $Id: basic.sql,v 1.6 2004/09/04 20:19:17 kegobeer Exp $
2     2  
3   #   3   #
4   # Dumping data for table `CPG_config`   4   # Dumping data for table `CPG_config`
(97 unchanged lines omitted)
102   INSERT INTO CPG_config VALUES ('log_ecards', '0');   102   INSERT INTO CPG_config VALUES ('log_ecards', '0');
103   INSERT INTO CPG_config VALUES ('email_comment_notification', '0');   103   INSERT INTO CPG_config VALUES ('email_comment_notification', '0');
104   INSERT INTO CPG_config VALUES ('enable_zipdownload', '1');   104   INSERT INTO CPG_config VALUES ('enable_zipdownload', '1');
105   INSERT INTO CPG_config VALUES ('slideshow_interval', '5000');   105   INSERT INTO CPG_config VALUES ('slideshow_interval', '5000');
    106   INSERT INTO CPG_config VALUES ('safe_mode_mkdir', '');
    107   INSERT INTO CPG_config VALUES ('safe_mode_cpg_path', '');
    108   INSERT INTO CPG_config VALUES ('exif_ignore1','resolutionUnit|FileName|FileSize|xResolution|yResolution|YCbCrPositioning|exifVersion|sensing|IPTC Copyright|componentConfig|makerNote|flashpixVersion|colorSpace|Width|Height|GPSLatitudeRef|GPSLatitude|customRendered|screenCaptureType|gainControl|');
    109   INSERT INTO CPG_config VALUES ('exif_ignore2','contrast|focalPlaneYResolution|sourceType|saturation|sharpness|compressScheme|ThumbnailSize|Thumbnail|IsColor|resolution|color|jpegProcess|Process|FileDateTime|dateTimeDigitized|fileModifiedDate|imageDesc|FlashUsed|aperture|');
    110   INSERT INTO CPG_config VALUES ('exif_ignore3','');
    111   INSERT INTO CPG_config VALUES ('admin_confirm','0');
    112   INSERT INTO CPG_config VALUES ('show_upload_user','0');
106     113  
107     114  
108   #   115   #
109   # Dumping data for table `CPG_filetypes`   116   # Dumping data for table `CPG_filetypes`
(60 unchanged lines omitted)
170   # Dumping data for table `CPG_categories`   177   # Dumping data for table `CPG_categories`
171   #   178   #
172     179  
173   INSERT INTO CPG_categories VALUES (1, 0, 'User galleries', 'This category contains albums that belong to Coppermine users.', 0, 0, 0, 0, 0, 0, 'NO');   180   INSERT INTO CPG_categories VALUES (1, 0, 'User galleries', 'This category contains albums that belong to Coppermine users.', 0, 0, 0, 0, 0, 0, 'NO');