mercurial - tortoisehg: kdiff3 doesn't run during merge -


i using tortoisehg.

kdiff3 runs when select "diff parent" or "diff local" context menu in workbench. however, kdiff3 doesn't run when merging (merge local) after pull. merge tool says following: % hg merge --verbose --tool=internal:merge 2 resolving manifests merging main.c.txt warning: conflicts during merge. merging main.c.txt incomplete! (edit conflicts, use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' retry unresolved file merges or 'hg update -c .' abandon [command returned code 1 fri jun 27 13:17:22 2014]

i have selected kdiff3 both three-way merge tool , visual diff tool in both global settings , repository settings. there else must do?

update: os windows 7

another update: (.hgrc in local repo shown below)

[extensions] hgext.extdiff =  [extdiff] cmd.kdiff3 =  [merge-tools] kdiff3.args = $base $local $other -o $output

update 2 (mercurial.ini):

[merge-tools] kdiff3.priority=-1 kdiff3.args=--l1 base --l2 local --l3 other $base $local $other -o $output kdiff3.regkey=software\kdiff3 kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=true kdiff3.gui=true

stephen

  1. kdiff3 not defined anywhere mergetool tortoisehg (in global or repository context)
  2. if order use kdiff3 difftool can not have , not enable extdiff extension
  3. both (needed) values can , have defined in tortoisehg gui: tortoisehg - global settings - tortoisehg

thg tools

or, in case of text-presentation mercurial.ini

[ui] merge = p4merge ... [tortoisehg] vdiff = p4merge

in case defined p4merge diff|merge tool repositories , have redefine in gui repo-settings (or write changed string hgrc) if repository i'll prefer use tools


Comments

Post a Comment

Popular posts from this blog

javascript - RequestAnimationFrame not working when exiting fullscreen switching space on Safari -

request animation frame stops working when exiting fullscreen clicking on original space's safari window. fine if fullscreen mode canceled escape key or calling cancelfullscreen(). steps reproduce: open https://dl.dropboxusercontent.com/u/769042/prezi/safari-fullscreen.html click "draw raf", kittie appears click "fullscreen", go fullscreen click "draw raf", kittie appears go space original safari was, showing "click exit fullscreen mode", click anywhere, out fullscreen click "draw raf", nothing happens what handling click calling: window.requestanimationframe(draw); which draws on canvas context: function draw() { ctx.drawimage(img, math.random()*500|0, math.random()*400|0, 100, 100); } i checked .hidden , .visibilitystate, updated correctly. tested on osx 10.9.3, safari 7.0.4 (9537.76.4). has workaround/solution other switching old settimeout? this sounds webkit bug 88940 : using reque
Read more

Python ctypes access violation with const pointer arguments -

i have api i'm trying wrap in python (2.7.6 on win7) code using ctypes. here's api: client_dllfunc bool clientapi search_exporttoclipcopy(clienthsearch handle, int channel, lpctstr filename, const time_t& from, const time_t& to, const bool* cameras, int length, bool usepassword, lpctstr password, bool includetextin = false, bool excludeplayer = false); the issue i'm having cameras argument; , i've had issue other const pointer arguments well. here's how i'm wrapping api: def search_exporttoclipcopy(self, hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, password, includetextin=true, excludeplayer=false): exporttoclipcopy = self.sdkdll.search_exporttoclipcopy exporttoclipcopy.argtypes = [c_int, c_int, c_wchar_p, c_long, c_long, pointer(c_bool), c_int, c_bool, c_wchar_p, c_bool, c_bool] exporttoclipcopy.restype = c_bool exporttoclipcopy(hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, pass
Read more