1.5.8 tarball doesn't match subversion

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

1.5.8 tarball doesn't match subversion

Kenneth Porter
The images in skins/common/images/icons don't match between the release
tarball and the subversion repo.

Issue these two commands to see one difference. The PNG files in the
tarball are one byte larger. What's going on?

tar tvfz /tmp/mediawiki-1.5.8.tar.gz | grep skins/common/images/icons/
svn ls
http://svn.wikimedia.org/svnroot/mediawiki/tags/REL1_5_8/phase3/skins/common/images/icons/ 
-v

I have a recent installation of 1.5.8 from tarball and I'd like to change
to using a subversion WC, and comparing my installation to the freshly
checked-out WC shows these anomalies. Here's a complete list of the
differences between the tarball and the WC:

diff -rq mediawiki-1.5.8-SVN mediawiki-1.5.8 | grep -v svn
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-c.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-c.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-cpp.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-cpp.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-deb.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-deb.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-dvi.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-dvi.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-exe.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-exe.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-h.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-h.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-html.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-html.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-iso.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-iso.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-java.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-java.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-mid.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-mid.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-mov.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-mov.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-o.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-o.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-ogg.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-ogg.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-ogg.xcf and
mediawiki-1.5.8/skins/common/images/icons/fileicon-ogg.xcf differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-pdf.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-pdf.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-ps.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-ps.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-rm.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-rm.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-rpm.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-rpm.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-svg.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-svg.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-tar.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-tar.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-tex.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-tex.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-ttf.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-ttf.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon-txt.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon-txt.png differ
Files mediawiki-1.5.8-SVN/skins/common/images/icons/fileicon.png and
mediawiki-1.5.8/skins/common/images/icons/fileicon.png differ
Only in mediawiki-1.5.8-SVN/skins/common/images: mediawiki-large.xcf
Only in mediawiki-1.5.8-SVN/skins/common/images: mediawiki-largesquare.xcf
Files mediawiki-1.5.8-SVN/skins/simple/discussionitem_icon.gif and
mediawiki-1.5.8/skins/simple/discussionitem_icon.gif differ
Files mediawiki-1.5.8-SVN/skins/simple/external.png and
mediawiki-1.5.8/skins/simple/external.png differ
Files mediawiki-1.5.8-SVN/skins/simple/lock_icon.gif and
mediawiki-1.5.8/skins/simple/lock_icon.gif differ
Files mediawiki-1.5.8-SVN/skins/simple/mail_icon.gif and
mediawiki-1.5.8/skins/simple/mail_icon.gif differ

_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Brion Vibber
Kenneth Porter wrote:
> The images in skins/common/images/icons don't match between the release
> tarball and the subversion repo.
>
> Issue these two commands to see one difference. The PNG files in the
> tarball are one byte larger. What's going on?

Many image files were incorrectly marked as ASCII files in CVS, and therefore
were corrupted when imported to Subversion.

I've already corrected them on trunk, but it would be wise to fix them on branch
for future releases as well.

-- brion vibber (brion @ pobox.com)


_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l

signature.asc (257 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Kenneth Porter
In reply to this post by Kenneth Porter
On Wednesday, April 05, 2006 2:41 AM -0700 Kenneth Porter
<[hidden email]> wrote:

> Issue these two commands to see one difference. The PNG files in the
> tarball are one byte larger. What's going on?

I dropped the PNG files into my web space and pulled them up into Firefox
and FF says that those in the repo are damaged, but the ones from the
tarball display ok.

Am I perhaps pulling from the wrong Subversion tag? Is there another tag
that actually matches the tarball?


_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Kenneth Porter
In reply to this post by Brion Vibber
On Wednesday, April 05, 2006 2:50 AM -0700 Brion Vibber <[hidden email]>
wrote:

> Many image files were incorrectly marked as ASCII files in CVS, and
> therefore were corrupted when imported to Subversion.
>
> I've already corrected them on trunk, but it would be wise to fix them on
> branch for future releases as well.

Ok, thanks, that explains it. Is there a node in the repo that matches the
tarball from which I can pull a matching WC?


_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Rob Church
In reply to this post by Brion Vibber
On 05/04/06, Kenneth Porter <[hidden email]> wrote:
> Ok, thanks, that explains it. Is there a node in the repo that matches the
> tarball from which I can pull a matching WC?

See http://www.mediawiki.org/wiki/Download_from_SVN and note that one
of the examples there explains how to obtain a particular release.


Rob Church
_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Kenneth Porter
--On Wednesday, April 05, 2006 4:38 PM +0100 Rob Church <[hidden email]>
wrote:

> See http://www.mediawiki.org/wiki/Download_from_SVN and note that one
> of the examples there explains how to obtain a particular release.

No, I mean *which* revision and path in the repo is the one that matches
the tarball? (Since the one tagged 1.5.8 doesn't.) Is there a trunk
revision that's the "real" 1.5.8?
_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Reply | Threaded
Open this post in threaded view
|

Re: 1.5.8 tarball doesn't match subversion

Brion Vibber
Kenneth Porter wrote:
> --On Wednesday, April 05, 2006 4:38 PM +0100 Rob Church <[hidden email]>
> wrote:
>
>> See http://www.mediawiki.org/wiki/Download_from_SVN and note that one
>> of the examples there explains how to obtain a particular release.
>
> No, I mean *which* revision and path in the repo is the one that matches
> the tarball? (Since the one tagged 1.5.8 doesn't.) Is there a trunk
> revision that's the "real" 1.5.8?

The tarball of 1.5.8 was made from CVS, tag REL1_5_8, with slight postprocessing.

tags/REL1_5_8 in SVN is very similar, modulo corruption caused by incorrect
ASCII checkins of image files. There is at this time no tag in SVN which will
give you exactly the files in the 1.5.8 tarball.

-- brion vibber (brion @ pobox.com)


_______________________________________________
MediaWiki-l mailing list
[hidden email]
http://mail.wikipedia.org/mailman/listinfo/mediawiki-l

signature.asc (257 bytes) Download Attachment