Branche vs Baranche

[Vojtěch Tajmr]

Hi, is it possible to compare two branches between each other? I know how to get list of changed files form pre-commit. But i have no idea if is possible to get all files that was change in second branche after first commit to this brache. Thanks for any help/ tips. I was trying to serch for my answer in Tortoise book, but didnt fint it. :/

[Bruce C]

Hi,

One simple option would be to checkout the code twice, to separate working copy folders and then use your standard diff tool (e.g. WinMerge) to compare those local folders. Obviously, for each checkout there's the option to select the revision that you want to retrieve, so you can use this method to compare historical revisions and not just the tip of the branches (or trunk).

Hope this helps.

[Bruce C]

Hi again,

Another alternative would be to checkout one branch and then merge the changes from the other branch. The differences can then be reviewed using the Check for Modifications option. The changes are only merged to the local working copy and so can be reverted (back to the original branch checkout) when the changes have been reviewed.

Hope this helps.

[Daniel Sahlberg]

fredag 5 augusti 2022 kl. 09:12:21 UTC+2 skrev vtd...@gmail.com:

Hi, is it possible to compare two branches between each other? I know how to get list of changed files form pre-commit. But i have no idea if is possible to get all files that was change in second branche after first commit to this brache. Thanks for any help/ tips. I was trying to serch for my answer in Tortoise book, but didnt fint it. :/

A few different options are listed in this Stackoverflow article: https://stackoverflow.com/questions/4675517/compare-files-between-two-branches-in-tortoisesvn

The best option in my opinion in the Repository Browser:

- Right click one branch and select Mark for comparison

- Right click the second and select Compare URLs.

You will get a separate window with a list of all changed (Added, Modified, Deleted) files.

Kind regards,

Daniel

 

[Bruce C]

Hi,

Not the OP, but thanks for those suggestions. I haven't tried those before, so that's something new for me to investigate. Unfortunately, my alternative answer missed these options because my normal server was offline when I replied, so I was replying from memory.

Thanks.