tortoise svn launches simultaneously tortoise merge and custom compare program - why tortoise merge?

[mboyk...@gmail.com]

I use beyond compare. When I try committing files I right click on a newly added file and select "compare with base". TortoiseSVN launches 2 compare programs. I don't think it should be launching tortoisemerge.

Thanks.

[Stefan]

how did you configure BC?

Note that you might have to put the placeholders for the paths in quotes.

[Michael Boyko]

Diff Viewer

(External)

"C:\Program Files\Beyond Compare 4\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

BTW it "compares with base fine" for previously added files (i.e. committing modifications). Only when there is not prior history (adding new file) does the "compare with base" launch the extra tortoisemerge program. Seems like it is probably a bug.

On Tue, Sep 11, 2018 at 1:53 PM Stefan via TortoiseSVN <torto...@googlegroups.com> wrote:

how did you configure BC?

Note that you might have to put the placeholders for the paths in quotes.

--
You received this message because you are subscribed to a topic in the Google Groups "TortoiseSVN" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/tortoisesvn/DAakt75ClYM/unsubscribe.
To unsubscribe from this group and all its topics, send an email to tortoisesvn...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/83ebf9f3-d74d-4ad0-ae70-72a51f0f7079%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[Michael Boyko]

What I would expect when doing this is only beyond compare would be launched with the left pane empty since the file has no base and the right side with the file contents. Or I suppose the "compare with base" could be grayed out/hidden since it doesn't have a base...

On Tue, Sep 11, 2018 at 1:53 PM Stefan via TortoiseSVN <torto...@googlegroups.com> wrote:

how did you configure BC?

Note that you might have to put the placeholders for the paths in quotes.

[Stefan]

When you say "compare with base", you mean from the commit dialog before the actual commit?

Or after an update in the "progress dialog"?

If the latter: that diff function creates a patch file because it has to diff three files: the one before the update, the local one (could have local modifications) and the one just fetched from the repo. So it's TMerge that gets started.

Stefan

[Michael Boyko]

The former. From the commit dialog where you get to enter the comments for the commit but before the commit is performed. 

--

You received this message because you are subscribed to a topic in the Google Groups "TortoiseSVN" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/tortoisesvn/DAakt75ClYM/unsubscribe.
To unsubscribe from this group and all its topics, send an email to tortoisesvn...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/029ae86f-877f-4e7a-b93d-17c33f3be6be%40googlegroups.com.

[mboyk...@gmail.com]

From the commit dialog where you enter comments.

[Luc Van der Veken]

Just out of curiosity, I tried if I could reproduce this.

I can, by setting a SVN property on the new file (Explorer file properties / SVN tab / Properties).

Just adding a file 'test.txt' with the word 'test' in it, commit, and diff it from the commit window, launches just my custom diff viewer.

But when I set the property "svn:eol-style" of that file to "CRLF" and then view the diffs from the commit window, it opens my custom viewer showing the file's contents, and TortoiseMerge to diff the properties.

And that's exactly what Tortoise is configured to do in my case: use a custom diff viewer for comparing the file contents, and TortoiseMerge to compare properties.

Could that be what's happening in your case too?

That would reduce the question to: is there anything setting file properties (for example EOL convention) on new files added to your repository?