CODEWITHSUNDEEP
svnmergebranchtrunk
user810430
user810430

Reputation: 11499

How to check the merges between branch and trunk in SVN?

I have committed many changes in branch , after merged to trunk.

So I have done many commit, merge, commit operations. Now I am not sure that all was made correct. Can I check if I not missed merge some revisions to trunk?

I am using TortoiseSVN 1.7.1, and could switch for that comparison to svn command client (but only if not possible with TortoiseSVN).

Upvotes: 1

Views: 3199

Answers (2)

Álvaro González
Álvaro González

Reputation: 146450

Start the "Merge" dialogue as if you were to port further changes. When prompted for a revision range, hit "Show log". Revisions that have already been merged will be greyed out and won't be eligible.

Upvotes: 1

mliebelt
mliebelt

Reputation: 15525

Since Subversion 1.5.x merge tracking is implemented. So every time you do a merge in Subversion, the info about the merge you have done is automatically tracked in Subversion in the directory where you started the merging. If you do that all the time e.g. from the trunk, all the mergeinfo will be combined there.

Have a look at the documentation of TortoiseSVN 1.7, and try to open the same dialog in TortoiseSVN. When using the checkbox "Include merged revisions", you will see not only the revisions from the current trunk, but also from the branches. The same information condensed you will see when you open the properties dialog for that directory:

enter image description here

The screenshot shows the merge tracking info (or short mergeinfo), so you see I have merged revisions 4-6 from b1 and 12 from b2 (whatever that means).

You will find a similar documentation to the SVN command client here.

Upvotes: 3

Related Questions