On Thu, Oct 31, 2013 at 1:53 PM, <[email protected]>wrote:
> How is that actually done? I installed Kompare a weeks ago and couldn't see > a way to apply a patch in the UI: > > http://waste.io7m.com/2013/10/31/kompare0.png > http://waste.io7m.com/2013/10/31/kompare1.png > http://waste.io7m.com/2013/10/31/kompare2.png When i use compare i first grab the "original" file version (from your example: before applying the stash), copy it to /tmp, then apply the stash, then do: kompare /tmp/foo.bar ./foo.bar i have never tried to select files from kompare's UI - it never occurred to me to try that (i'm a hard-core CLI user). If i'm not mistaken (but i might be), you can do this: fossil set gdiff-command kompare fossil gdiff foo.bar i don't immediately recall ever having tried that, but i do see that locally i have: [stephan@host:~]$ f set ... gdiff-command (global) kompare ('f' is a symlink to fossil on my systems) So, let me try that out... (edit main.c) f gdiff src/main.c that works. But... f gdiff --from 9147aa2c5b --to dbec64585a runs the diff one time for each "version step" between the two versions, so i get a series of one-version-removed diffs (or that's what it appears to be). So for more than one step it seems the export/copy/kompare approach would be simplest. -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
