[PATCH 6 of 6] Disable premerge by default

[Mads Kiilerich]

Do you specify a specific merge tool? You can always specify 
.premerge=True if you really want premerge. But the patch might leave 
you without a way to run premerge everywhere but on binary or symlink... 
Good point.

I thought eclipse had its own merge functionality which you could 
benefit from using instead?

/Mads


Bastian Doetsch wrote, On 09/17/2008 10:23 PM:
> Hi,
>
> actually we (MercurialEclipse) benefit from exactly that default to 
> premerge before resolving conflicts in Eclipse. We could change it, 
> but I wouldn't think this patch necessary.
>
> Bastian
>
> Am Mittwoch, den 17.09.2008, 21:06 +0200 schrieb Mads Kiilerich:
>> # HG changeset patch
>> # User Mads Kiilerich <mads at kiilerich.com <mailto:mads at kiilerich.com>>
>> # Date 1221678330 -7200
>> # Node ID cbcfa087b5f8708b5d794f5ae1f4202e643b97bc
>> # Parent  daa237db419ccf4f75bc541c7b019d2bba8cdf8b
>> Disable premerge by default
>> Premerge silently merges file content if possible. The result is in some cases
>> not what the user wants. Having it enabled by default isn't safe and isn't
>> mercurial-ish.
>>
>> I think this is a part of the right solution to issue1295.
>>
>> diff -r daa237db419c -r cbcfa087b5f8 mercurial/filemerge.py
>> --- a/mercurial/filemerge.py	Wed Sep 17 21:05:28 2008 +0200
>> +++ b/mercurial/filemerge.py	Wed Sep 17 21:05:30 2008 +0200
>> @@ -166,7 +166,7 @@
>>      repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcd, fco, fca))
>>  
>>      # do we attempt to simplemerge first?
>> -    if _toolbool(ui, tool, "premerge", not (binary or symlink)):
>> +    if _toolbool(ui, tool, "premerge", False):
>>          r = simplemerge.simplemerge(a, b, c, quiet=True)
>>          if not r:
>>              ui.debug(_(" premerge successful\n"))
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com <mailto:Mercurial-devel at selenic.com>
>> http://selenic.com/mailman/listinfo/mercurial-devel
>>
>>     

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3435 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080917/da4158ed/attachment.bin