Clarification: is the hgmerge program always called?
Christian Boos
cboos at neuf.fr
Tue May 16 07:38:25 CDT 2006
Matt Mackall wrote:
> On Mon, May 15, 2006 at 06:32:31PM +0200, Christian Boos wrote:
>
>> Hi,
>>
>> While doing some updates in the Wiki (turning "hg update -m"
>> into "hg merge"), I was a bit surprised by the explanations
>> concerning the merge program: it was written that Mercurial
>> tries to resolve the merge on its own, and only when it fails
>> to do so, calls an external merge program...
>>
>
> There are some conflicts that it resolves internally, but these are at
> the directory level, not the level of file contents.
Ok, thanks, and besides I looked at the code :)
I've updated the MergeProgram, Resolve, Conflict, TutorialMerge,
and Merge wiki pages accordingly.
Besides, there's the "history sensitive" merge extension Vadim wrote
some times ago. Is that still available?
And if you would use it, how should it be used (tell 'hgmerge' about it,
or localrepository.merge3 should be modified so that it can call a
merge hook?)
-- Christian
More information about the Mercurial
mailing list