On Thu, 2004-02-12 at 16:05 -0500, David Wendt wrote:
"There is, however, one major caveat with using `-kk' on merges.
Namely, it overrides whatever keyword expansion mode CVS would
normally have used. In particular, this is a problem if the mode
had been `-kb' for a binary file. Therefore, if your repository
contains binary files, you will need to deal with the conflicts
rather than using `-kk'."
Do we have any binaries in the repository?
62, by my count:
perl -MFile::Find -e "find sub { print (\$_, \"\n\") if (-f \$_ &&
-B \$_) }, '.'" | wc -l
62
Aah... so that's how you check. I dont have perl on this system, but I
guess there are a lot of binaries. Hope that they dont change on the
branch. Is it possible we could merge using -kb, or is this impossible?
I cant check, I
dont have access.
There's anonymous public access to the CVS repository on SourceForge:
http://sourceforge.net/cvs/?group_id=34373
You can also check the downloadable tarballs at:
http://wikipedia.sourceforge.net/
~ESP
Almost forgot about the read-only on sourceforge. (I must be losing it,
I commit to repositories on SF every day!)
------------------------------------------------------------------------
_______________________________________________
Wikitech-l mailing list
Wikitech-l(a)wikimedia.org
http://mail.wikipedia.org/mailman/listinfo/wikitech-l