You are here: PSPad forum > English discussion forum > Text diff usage

Text diff usage

Goto Page: 1 2 Next

#1 Text diff usage

Posted by: mgutt | Date: 03/21/2015 12:11 | IP: IP Logged

How do I use text diff? How is it possible to get a line from the destination file or set a line to the destination file?

I whish that it works similar to "Meld":
www.youtube.com

Key features:
- arrow keys left/right
- scroll in the middle jumps between differences
- write directly in both files

And it seems Text-Diff has several bugs:
1) I'm able to place the cursor anywhere (after the end of a line)
2) It's not possible to select multiple lines that includes diffs

Options: Reply | Quote | Up ^


#2 Re: Text diff usage

Posted by: pspad | Date: 03/21/2015 14:54 | IP: IP Logged

How to use text diff:

1. you can compare file with it's disk image - e.g. compare what did you changed
2. you can compare file with another file you choose useing open file dialog
3. you can compare 2 tabs

All operations is easy to handle with right mouse on file tab

You can jump to line in original code with Shoft+Ctrl+G (help / working with PSPad / Keyboard shortcuts)

Options: Reply | Quote | Up ^


#3 Re: Text diff usage

Posted by: mgutt | Date: 03/25/2015 21:31 | IP: IP Logged

You mean I have to keep in mind the difference and write it by hand in the file? Sorry, but this is not really what I like to have. Please take a look at the video that shows how Meld works. I don't need a 1:1 copy of Meld, but maybe you can:
a) add transfer buttons for differing lines
or
b) add an option to open diffs in Meld instead of the built in diff feature to avoid inventing the wheel again.

Meld is freeware as well.

I will donate €200 if the diff tool becomes much more omfortable or you add a link to open two documents through PSPad in Meld e.g. right click on tab -> "open this document and the following... in Meld"

Options: Reply | Quote | Up ^


#4 Re: Text diff usage

Posted by: pspad | Date: 03/25/2015 22:05 | IP: IP Logged

Meld is nice tool. Specialized to file compare. Meld itself is 2 times bigger than whole PSPad itself. I can say, PSPad never be as good as Mled in file compare.
But I can take a look if is possible to call meld with two files as parameter.
It can be possible, as I see: meldmerge.org

Options: Reply | Quote | Up ^


#5 Re: Text diff usage

Posted by: toralf | Date: 04/02/2015 11:30 | IP: IP Logged

I would also wish for some more merging/copy features to the text compare view.
E.g.
- copy selected line from A to B
- copy selected line from B to A
- delete selected line
- move line up
- move line down
- save A
- save B

Another good program, even though not as visually advanced as Meld is KDiff3, kdiff3.sourceforge.net

notepad++ went another way with their plugin. It shows both files in their own editor windows side by side while it is showing the compare result and the normal editor functions exist in both windows. But it only shows that a line is different or missing. It doesn't show what is different within a line.

Options: Reply | Quote | Up ^


#6 Re: Text diff usage

Posted by: toralf | Date: 04/02/2015 11:46 | IP: IP Logged

Another good comparing/merging tool is WinMerge. winmerge.org

I guess it would be easiest for you if you would
- somewhere allow to define an external tool for merging.
- allow a shortcut to be set to call the merger tool, or a button in the text diff view/tab.
- update the content of the files automatically when the tool is done, or at least ask.

I do not know how it would be easiest done to select three files, but I guess it would be a great start if at least two files could be opened automatically in any of these external tools from within pspad.

Options: Reply | Quote | Up ^


#7 Re: Text diff usage

Posted by: pspad | Date: 04/02/2015 12:04 | IP: IP Logged

I guess better will be use MELD or any other external Compare tool. I will add possibility to configure external tool in PSPad.
If external compare tool will be set, PSPad will call external tool directly instead of the internal TextDiff

Edited 1 time(s). Last edit at 04/02/2015 12:09 by pspad.

Options: Reply | Quote | Up ^


#8 Re: Text diff usage

Posted by: MadCompie | Date: 04/02/2015 12:24 | IP: IP Logged

IMHO a really better solution is DiffMerge:
sourcegear.com

Also GUI way of 3-file comparing, folder comparing, ...

BUT : extra possibility to merge as "PREPEND" and "APPEND" because not everything should be merged as "OVERWRITE" ...

I use it some time now in PSP in combination with the integrated scripting (VB script) :

Alt+F1 selects the active file as the first file (FILE1-new)
Alt+F2 selects the active file as the second file (FILE2-old)
Ctrl+Alt+C opens DiffMerge and compares FILE1 & FILE2

After aplying changes, PSP offers the possibility to accept the changes from DiffMerge!

Edited 1 time(s). Last edit at 04/02/2015 12:26 by MadCompie.

Options: Reply | Quote | Up ^


#9 Re: Text diff usage

Posted by: toralf | Date: 04/02/2015 13:05 | IP: IP Logged

MadCompie:
I use it some time now in PSP in combination with the integrated scripting (VB script)

Would you mind sharing your VB script?

Options: Reply | Quote | Up ^


#10 Re: Text diff usage

Posted by: pspad | Date: 04/02/2015 13:46 | IP: IP Logged

In the next build possibility to define external tool will be available in program settings / Text difference.
You can set any tool what support command line handling.
If you will set it, PSPad will use external tool instead of the integrated one.

Options: Reply | Quote | Up ^


Goto Page: 1 2 Next





Editor PSPad - freeware editor, © 2001 - 2017 Jan Fiala
Hosted by Webhosting TOJEONO.CZ, design by WebDesign PAY & SOFT, code Petr Dvořák