Álvaro González
Álvaro González

Reputation: 146593

TortoiseSVN incorrectly reports all revisions as merged

I have a repository with the standard trunk/branches/tags layout where HEAD is r383, all development takes place in trunk and changes up to r367 have already been published in Production site.

Customer has decided that we wants some pending changes in Production but not all. So I decided to create a new branch that would reflect code that's ready to release, starting from the trunk revision that's currently published:

Branch/tag

Now I want to merge some revisions from trunk into my new branch. To my surprise, Tortoise SVN reports the complete trunk as already ported:

Merge - Show log

The funny thing is that I can still cherry-pick the revisions I want, the merge completes successfully (I don't even need to select "Force the merge") and svn:mergeinfo gets properly populated:

Edit properties

... but I cannot use TortoiseSVN to visually identify what's ported and what not.

Have I done something fundamentally wrong or I've just hit a bug?

Upvotes: 1

Views: 234

Answers (1)

Álvaro González
Álvaro González

Reputation: 146593

It was a bug in TortoiseSVN. As of today, it's already fixed in nightly builds.

Upvotes: 1

Related Questions