[PATCH 2 of 3] merge: provide *_ISLINK environment vars to merge helper

Patrick Mézard pmezard at gmail.com
Fri Oct 5 11:47:14 CDT 2007


Steve Borho a écrit :
> On Fri, 2007-10-05 at 10:23 -0500, Matt Mackall wrote:
>> On Fri, Oct 05, 2007 at 12:55:43AM +0200, Patrick Mezard wrote:
>>> # HG changeset patch
>>> # User Patrick Mezard <pmezard at gmail.com>
>>> # Date 1191445776 -7200
>>> # Node ID 51655b6b134e2bb19ba75e65e6bdc82108a563bb
>>> # Parent  1f29a31ea5ba0aab660c18e5678942e82d462be6
>>> merge: provide *_ISLINK environment vars to merge helper
>>>
>>> Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
>> If they have a filename and a revision id, it certainly is possible to
>> know: just ask hg.
> 
> Perhaps this could be solved in a different way.  Is there any reason
> not to call util.set_link() on the base and other temp files when
> applicable?  That would eliminate the ambiguity.

That would not work on systems not supporting symlinks. I think we 
really want to abort symlink merges on these.

--
Patrick Mézard



More information about the Mercurial-devel mailing list