Compare branch to trunk - using repo browser "compare URLs" - unexpected results

[Charles Wilt]

Using TortiseSVN 1.9.5

I'm trying to compare the trunk to a branch created from the trunk.

Inside the repo browser, I've right click on the branch and selected "mark for compare" and then right-clicked on the trunk and selected "compare URLs"  (also tried "Compare URLs (content only)")

Given that I'd just previously did a sync merge from branch to trunk, using "Merge All" and committed those changes; I expected to only see the objects that had been change just in my branch.

However, I'm getting list of changes files which includes objects I haven't touched in my branch.

It appears from the log, they've been changed on the trunk.

What am I doing wrong?  Or misunderstanding about this process?

Thank you!

Charles

[Charles Wilt]

From windows explorer...

If I hold shift and click on the working copy of my branch and select "Diff with URL" and enter the URL for the trunk...

Then the resulting "File Patches" pop-up of the TM window shows the list of 6 files I expect to see.

Clicking on a file in the list opens the trunk version and my branch version in TM.

Charles

[Stefan]

You're comparing the HEAD revisions of your branch with the HEAD revision of trunk. So what you get is the difference between those two - anything that's different will show up.

Stefan

[Charles Wilt]

On Tuesday, November 14, 2017 at 11:44:16 AM UTC-7, Stefan wrote:

You're comparing the HEAD revisions of your branch with the HEAD revision of trunk. So what you get is the difference between those two - anything that's different will show up.

Stefan

What you're saying seems to agree with what I see in the logs....

But I thought the whole purpose of a "sync merge" from trunk to my branch was to bring the changes made in the trunk down into my branch?

Is there some way in the repo browser to compare trunk to branch and see just what's been changed in the branch?

I'm trying to move our team to doing code reviews with the help of SVN, what I'm looking for is an easy way for a teammate to see what I've actually changed and what those changes are without having to bring down my branch.

Also note that my local branch working copy is a sparse checkout...

Thank you,

Charles

 

[Stefan]

On Wednesday, November 15, 2017 at 12:05:59 AM UTC+1, Charles Wilt wrote:

On Tuesday, November 14, 2017 at 11:44:16 AM UTC-7, Stefan wrote:

You're comparing the HEAD revisions of your branch with the HEAD revision of trunk. So what you get is the difference between those two - anything that's different will show up.

Stefan

What you're saying seems to agree with what I see in the logs....

But I thought the whole purpose of a "sync merge" from trunk to my branch was to bring the changes made in the trunk down into my branch?

Is there some way in the repo browser to compare trunk to branch and see just what's been changed in the branch?

Sure: show the log for the branch, select the HEAD-revision, scroll down to the first revision of that branch and Ctrl-Click that revision (so that both that and the HEAD revision are selected).

Then right-click and choose "Show differences" and you'll get a diff for the changes you've done on that branch.

 

Stefan