External diff tool bug
Ryan Lindsay
I think this behavior changed around 4-6 months ago after an update (sorry I cannot be more specific).
I have SmartSVN: version 9.3.1 #7058, installed: #7053
SmartSVN Support
> They are fed in correctly with a local change to the working copy or a change in
> the commit history, but not with an update to the working copy (a change made in
> the repo).
--
Best regards,
Thomas Singer
syntevo GmbH
http://www.syntevo.com
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/smartsvn/a3f99a80-a792-49e7-bd2e-fee67db37337%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>
Ryan Lindsay
To reproduce, just set up a batch file or whatever that gets called to do an external compare (like in the image I attached earlier), then launch it (double click on a file in SmartSVN) with local changes and then with remote changes -- the old & new (left file & right file) that are fed in will be flipped in those two cases.
SmartSVN Support
I can't reproduce this with SmartSVN 9.3 - neither with an external nor with the built-in file compare, neither with double click not with Query | Show Changes.
Ryan Lindsay
Further info, so that I can hopefully get a fix...
When comparing changes made locally, the working copy file is correctly ${rightFile}
When comparing changes made remotely, the working copy file is still ${rightFile}, when it should be (and used to be in previous versions on SmartSVN) ${leftFile}
I hope that makes sense. If you try this out with some type of comparison tool, the two different ways (you are comparing a change you made locally to the repo vs. you are comparing a change someone else made in the repo to your local file), it should be obvious.
SmartSVN Support
What compare command in SmartSVN you are using?
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
Ryan Lindsay
> Hi Ryan,
>
> What compare command in SmartSVN you are using?
>
> --
> Best regards,
> Thomas Singer
> syntevo GmbH
> http://www.syntevo.com
Please see attached screenshot. Sorry for the delay, but I hope this answers your question.
SmartSVN Support
I'm meant, what command (menu item) you've invoked in SmartSVN.
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
Ryan Lindsay
> Hi Ryan,
>
>
> --
> Best regards,
> Thomas Singer
> syntevo GmbH
When a local working copy file is not up to date with the HEAD (is a previous version relative to HEAD), all of the below options give the same (incorrect/different than earlier version of SmartSVN) result:
- Double click
- Query, Compare with HEAD
- Query, Compare with Revision... [and choose HEAD]
Again, when there are local changes relative to the repo, or if I double click on a file in a Log window, the changes are shown correctly (the Left and Right file parameters are fed in correctly).
SmartSVN Support
I only can reproduce the problem partly. The working copy file needs to be modified and there needs to be a newer revision at the HEAD.
> - Double click
Without local modification, the double-click (or Query | Show Changes) would try to open the working copy file. Only for local modifications, double-click (or Query | Show Changes) a compare is opened, but it compares with the pristine copy (not HEAD), so the modified working copy is newer and hence it is shown at the right.
> - Query, Compare with HEAD
> - Query, Compare with Revision... [and choose HEAD]
For unmodified working copy, Compare with HEAD or Compare with Revision would have to first compare the local revision with the remote revision to decide which content to show where, but is this really worth the effort?
--
Best regards,
Thomas Singer
syntevo GmbH
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
SmartSVN Support
> to first compare the local revision with the remote revision to decide which
> content to show where
Ryan Lindsay
> Hi Ryan,
>
>
> > - Double click
>
> Without local modification, the double-click (or Query | Show Changes) would try to open the working copy file. Only for local modifications, double-click (or Query | Show Changes) a compare is opened, but it compares with the pristine copy (not HEAD), so the modified working copy is newer and hence it is shown at the right.
>
> > - Query, Compare with HEAD
> > - Query, Compare with Revision... [and choose HEAD]
>
> Both is new, the working copy and the HEAD, so it is unclear what to put where so we decided to use the (modified) working copy content at the right.
>
> For unmodified working copy, Compare with HEAD or Compare with Revision would have to first compare the local revision with the remote revision to decide which content to show where, but is this really worth the effort?
>
I will explain using a text file and the built in SmartSVN comparison tool, which has the same behavior (meaning that it changed compared to previous versions of SmartSVN).
With a modified working copy relative to (newer than) the repo (HEAD), when you double click, the compare has the repo (old, pristine) copy on the left and local working (new) copy on the right. This is expected.
With an unmodified working copy, and with the repo (HEAD) changed relative to (newer than) the working copy, when you double click, the compare has the repo (new) copy on the left and local working (old) copy on the right. This is NOT expected.
With a Word file comparison tool, this inconsistent behavior is VERY inconvenient. It means that in the latter case new text is crossed out and old text is shown as being added.
It sounds like SU-19405 does not describe the fix I am asking for. I do not want a new feature, I would like SmartSVN to consistently perform comparisons -- in the same way it had in previous versions for many years.
SmartSVN Support
> It sounds like SU-19405 does not describe the fix I am asking for. I do not want a
> new feature, I would like SmartSVN to consistently perform comparisons -- in the
> same way it had in previous versions for many years.
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
Ryan Lindsay
> Hi Ryan,
>
> > new feature, I would like SmartSVN to consistently perform comparisons -- in the
> > same way it had in previous versions for many years.
>
> Which last SmartSVN version works as expected for you?
>
> --
> Best regards,
> Thomas Singer
> syntevo GmbH
> http://www.syntevo.com
This behavior changed around the beginning of the year after I made an update; sorry I cannot be more specific.
SmartSVN Support
<https://www.smartsvn.com/download/archive/>
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit
Ryan Lindsay
> Please check your SmartSVN settings directory for subdirectories of previous versions. You can find older versions to try at
>
> <https://www.smartsvn.com/download/archive/>
>
> --
> Best regards,
> Thomas Singer
> syntevo GmbH
> http://www.syntevo.com
Attached is what my Settings Path looks like.
SmartSVN Support
What older SmartSVN version have you found out that worked as you like it to behave?
> You received this message because you are subscribed to the Google Groups
> "SmartSVN" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to
> smartsvn+u...@googlegroups.com.
> To view this discussion on the web visit