Windiff is a diff tool, but not a merge tool. The most it'll do is dump the merged file into an editor with !> and <! in front of the different lines. That's cumbersome enough to produce editing errors.
Google found me a few, including one Free Software project that looks OK (integrated editor) but has some features missing (Save As, three-file diff). WinMerge http://winmerge.sourceforge.net/
One that looks very full-featured, but costs $75, is Guiffy http://www.guiffy.com/features.html
Chris
Cory Nelson wrote:
windiff - http://msdn.microsoft.com/library/default.asp?url=/library/en-us/tools/tools...
On Mon, 04 Oct 2004 00:18:45 -0400, Chris Phoenix cphoenix@crnano.org wrote:
Diffing between 1.3.3 and 1.3.5, it looks like you don't change the database at all. Is that correct?
Can anyone recommend me a good diff/merge tool for Windows? I've made a fair number of changes and will make more, and many of them (like the article/category blurring) will never make it into the distro, so I'll have to merge my changes forward each time I update.
Thanks, Chris
Brion Vibber wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
MediaWiki 1.3.5 is a security update, which contains a small fix for a potential cross-site scripting vulnerability. All MediaWiki 1.3.x users are strongly encouraged to upgrade to this latest release.
The only substantial change from 1.3.4 is in includes/RawPage.php, so you can copy that one file in to perform a 'hotfix'. (Copy also includes/DefaultSettings.php to update the version number.)
Changes from 1.3.4:
- Clean up input validation in 'raw' page output mode which was a potential
cross-site scripting opportunity.
Release notes: http://sourceforge.net/project/shownotes.php?release_id=271848
Download: http://prdownloads.sf.net/wikipedia/mediawiki-1.3.5.tar.gz?download
Wiki admin help mailing list: http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
Bug report system: http://bugzilla.wikipedia.org/
Play "stump the developers" live on IRC: #mediawiki on irc.freenode.net
- -- brion vibber (brion @ pobox.com)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBXGXdwRnhpk1wk44RAmIwAJ0RupGm+mNo1cZ433k8hHa7J50U2QCgnuG+ SZLnmAK5JuKaHyIaVkxvHbg= =0PBU -----END PGP SIGNATURE-----
MediaWiki-l mailing list MediaWiki-l@Wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-l
-- Chris Phoenix cphoenix@CRNano.org Director of Research Center for Responsible Nanotechnology http://CRNano.org
MediaWiki-l mailing list MediaWiki-l@Wikimedia.org http://mail.wikipedia.org/mailman/listinfo/mediawiki-l