Graphic Scatter for Darks

It’s not very convenient for me to see the changes in the dark text format, so I was looking for a tool to display a good side by side comparison of changes.

For whatsnew I can just use meld , but when I need to see the changes already recorded, it is not so simple. I read that diffuse allows you to compare different versions, but I can't get it to work.

I tried

 diffuse -r HEAD^1 -r HEAD^2 myfile.py 

but it fails (I think the rename name is specific to git), so does anyone know how to see the latest changes in darcs?

Suggestions are welcome for another tool that does the job (and does not require a web server setup).

+6
source share
2 answers

in fact you should write something like:

 darcs diff --diff-command="diffuse %1 %2" myfile.txt 

It works with ECMerge (the tool I'm working on), it should work smoothly with diffuse. Darcs will invoke diffuse with temporary files as needed (to compare files from the repository). By the way, ECMerge can dig into Darcs configurations with its browser.

Edition:

for markup or patches in the repository, use the notation --from-tag= or --from-patch= and --to-tag= or --to-patch= . You should be able to do what you want, however note that from-patch means "from the patch" and --to-patch means "before after the patch." it wasn’t obvious to me ... (use the darcs changes )

+4
source

I don’t know how to integrate with darcs, but KDiff3 is a great diff / merge graphical application available for both linux, macos and windows.

0
source

Source: https://habr.com/ru/post/903188/


All Articles