PrestoSoft Community

I would appreciate a command-line option not to change the default session for the next launch. Changing the session almost every time I do a GUI comparison is inconvenient. I would even go as far as to argue that a session specified on the command line (as opposed to picked in the GUI) is used to t...

Oh, I remember what was the issue. I intend the "git" session to only be used with git diff, git difftool, etc. However, after running those commands, EDP remembers the session used and uses it the next time I run EDP. There should be a way to tell EDP that I am using this session TEMPORAR...

I just rechecked. You are right, it doesn't update the registry with the folders, just the files (after drilling down).

I would assume so. If I launch EDP with "no history", I expect it to save no history, just like it says on the tin.

That said, I believe that it also saved the folder history, despite being told not to.
I'll check tomorrow.

psguru wrote: ↑Wed Feb 16, 2022 8:47 am

Will /se:Session work in this situation?

Yes, it will.

I tried it. Currently git invokes EDP with these flags: -se:git -nh
However, after I dig into individual files, the history for the file comparison is still saved for the "git" session.

While not ideal, it seems to me that introducing a delay between git calling EDP and the comparison starting might help, especially if there was any way to tell when Defender has stopped examining the newly-copied files. So, have git call (say) a batch file that waits for something (maybe just a fe...

I suspect that in this case, FILE_NOTIFY_CHANGE_ATTRIBUTES causes the false positive. First of of, you can't know without testing your hypothesis. Which is why I said "I suspect". It could be a different flag. Second, why is watching for FILE_NOTIFY_CHANGE_ATTRIBUTES is incorrect? I did n...

There must be some files that are being created/deleted/modified while the directory comparison view is on. You should be able to inspect your file system to see what they are. Well, yes and no. I used the SysInternals Process Monitor to see what processes access the files, trimmed the log to only ...

I also asked the same question on SO and got the following comment: The --dir-diff option pushes all the work off to the diff tool itself: Git just extracts the two commits to be compared into two temporary directories, and then sends the names of the two directories to the diff tool. So everything ...

What exactly do you want to be investigated? I'm not sure what the problem is. As I wrote above: Running the following git difftool --dir-diff <some branch> <some other branch> Displays a directory comparison as expected, but then I start getting incessant pop-ups that files got changed prompting t...

Not directly but you can always export your options to a file and use the /g option to use the saved options files. The behaviour is still problematic, and disabling the notifications is a workaround at best (not an optimal one, since any changes need to be exported again). This did not happen with...

Unfortunately, I am having another issue. Running the following git difftool --dir-diff <some branch> <some other branch> Displays a directory comparison as expected, but then I start getting incessant pop-ups that files got changed prompting to re-compare the directories. Indeed, many of the displa...

Actually, from reading the help page, it appears that the original suggestion was correct. Comparison Exit Codes 0 identical files or directories 1 different files or directories 2 an error occurred Merging Exit Codes 0 no conflicts 1 some conflicts were found 2 an error occurred EDP returns a non-z...

From the documentation of git's diff tool integration: difftool.trustExitCode Exit difftool if the invoked diff tool returns a non-zero exit status. See the --trust-exit-code option above for more details. --[no-]trust-exit-code git-difftool invokes a diff tool individually on each file. Errors repo...

Why does https://www.prestosoft.com/edp_versioncontrol.asp recommend setting merge.trustExitCode to false?