Bugs item #2119138, was opened at 2008-09-19 18:48
Message generated for change (Settings changed) made by tksoh
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=968354&aid=2119138&group_id=199155
Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: kiilerix (kiilerix)
Assigned to: Nobody/Anonymous (nobody)
Summary: Missing merge-tools priority
Initial Comment:
Mercurial.ini lists kdiff3 before gpyfm. Both are included in the installer,
and they have the same default priority. Which tools is chosen is apparently
not deterministic.
Please add a priority so that the priority is deterministic and follows the
configuration order.
(IMHO you could and should leave gpyfm out of the installer. With TortoiseHg
you make it easy to use Mercurial. Offering gpyfm as an option adds complexity
and weight and thus degrades TortoiseHg. gpyfm should definitely not be the
default. IMHO ;-)
----------------------------------------------------------------------
Comment By: kiilerix (kiilerix)
Date: 2008-09-23 07:39
Message:
Looks fine
----------------------------------------------------------------------
Comment By: TK Soh (tksoh)
Date: 2008-09-22 23:26
Message:
There are some problems with you patches, and I was unable to apply them,
so I manually copy your changes into mercurial.ini, and pushed them to the
installer's patch queue:
http://freehg.org/u/tksoh/tortoisehg_installer_mq/
Thanks.
----------------------------------------------------------------------
Comment By: kiilerix (kiilerix)
Date: 2008-09-22 19:02
Message:
Related patch proposal: kdiff3 --auto will overrule merge-tool premerge
setting.
File Added: no-kdiff3-auto.patch
----------------------------------------------------------------------
Comment By: kiilerix (kiilerix)
Date: 2008-09-22 19:00
Message:
http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration
describes merge-tool settings.
Proposed patch attached.
File Added: merge-tools-priority.patch
----------------------------------------------------------------------
Comment By: TK Soh (tksoh)
Date: 2008-09-22 17:34
Message:
I am not familiar with merge-tool's settings (the mercurial.ini was created
by Steve Borho), so any suggestion on the priority list?
----------------------------------------------------------------------
Comment By: kiilerix (kiilerix)
Date: 2008-09-22 16:56
Message:
To me that would be a good resolution. Some Sun people might disagree, but
they probably run Solaris anyway and are used to a newer version of gpyfm
;-)
The mercurial.ini you ship will however remain ambiguios; diffmerge and
tortoisemerge have the same default priority as kdiff3. I suggest making
all priorities explicit.
----------------------------------------------------------------------
Comment By: TK Soh (tksoh)
Date: 2008-09-22 13:54
Message:
We will stop bundling gpyfm beginning next release, which should eliminate
the ambiguity.
----------------------------------------------------------------------
You can respond by visiting:
https://sourceforge.net/tracker/?func=detail&atid=968354&aid=2119138&group_id=199155
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
