Re: Merging different types of files

[John Minnihan]

Define the file handling in cvswrappers, such that the expansion mode is
appropriately applied on a per file basis rather than wholesale via a command
line switch.

This technique is discussed in many places (probably this list archive for
starters).

address@hidden wrote:

> and in general we're interested in the keyword substitution feature for the
> text files. However, the binary files are stored in the repository with the
> "-kb" option, to prevent the keyword substitution and the line-ending
> conversions from taking place.
>
> What is the right way to merge such a project?

-----
John Minnihan
mailto:address@hidden
http://www.freepository.com