How to exclude files from merging

[Mathieu Clabaut]

On Mon, Nov 10, 2008 at 8:02 AM, Kauker, Hubert <
Hubert.Kauker at travelbasys.de<https://mail.google.com/mail?view=cm&tf=0&to=Hubert.Kauker@travelbasys.de>
> wrote:

>  ...
>
> 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
>
>
>
You may have a look at  :
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration
and
http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks#mergemineortheir

In your .hgrc, you then may add something like
[merge-patterns]
**.ext = internal:local
 to keep your version of file ending with .ext extension...

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