How to exclude files from merging

[Kauker, Hubert]

The wiki makes a few remarks about what mercurial does with binary files and
states that "binary files are an ill-defined concept".

 

Well, in fact, I do have the problem: how can certain files in a project be
configured NOT to be merged?

 

This does not always concern binary files; the case arises with certain text
files as well.

Some configuration files, for example, may be sensitive to any kind of
change, even non-overlapping ones.

This means that one change made near the top of the file and another made
near the end of the file may leave the file in an inconsistent state.

By conventional merge logic they will be happily merged, neglecting that
they are, in fact, in conflict.

 

The wiki says that hg entirely relies on the external merge tool to decide
which files need merging or not, and if so, how this should be done.

Fine, in most cases.

But each developer is responsible to configure the local merge tool in his
or her own way, and local merge tools may be quite different, too.

One may remember to prevent merging on *.ini files, say, another may forget
it.

 

Is there a way to centrally tell the repo and all of its clones that certain
files must NOT be merged by ANY merge tool?

 

Thanks, Hubert

 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20081110/ef431621/attachment.htm