SVN: Merge bug fixes from trunk to stable

Question

CVS

First, our wokflow:
There is a trunk and there are stable branches, for example ^/branches/stable-2
Normal day-to-day development is going on in the trunk. Feature branches for development are created only for large big features.
Our tester only works with the stable branch.
At a certain moment, when the functionality is ready in some form and it needs to be submitted for testing (primary, supporting), I
svn cp ^/trunk ^/branches/stable-3 -m "creating stable-3 with new functional"
then test it with the tester, and bugs are fixed in the trunk and in the stable I do
svn merge ^/trunk
svn ci -m "sync"
this until there are no new features in the trunk.

Now the situation on which there is a question

Let's say then under commit 100 a commit comes to the trunk that does not need to be merged into the stem,
but 101 and 102 are necessary.
then I do so
look that smergeno
svn pg "svn:mergeinfo"
I see something like there
/trunk:53-99
And I understand that everything I need is merged, up to the hundredth commit that I don’t need, which means that merging is just with its pass
svn merge -r100:102 ^/trunk
, while mergingfo takes the form
/trunk:53-99,101-102
And I commit all this.

Question:
I'll have to remember that this commit is not worth merging, and the ability to just merge without specifying commits will be lost.
And I would like to somehow mark that these commits do not need to be merged consciously.
There is an option to register them in merdzhinfo but not really merge. But I don't really like it and our svn guru categorically doesn't like it. Have any of you done this, and how do you generally act in such situations?

Answer 1

The record-only merge operation is the recommended way to lock a revision for a merge. There is even a special option for this: "--record-only
" branch needs to execute the command:
svn mege --record-only -c 100 "^/trunk"
See the Blocking changes section in the Advanced Merging chapter

Answer 2

But I found the first minus of such a system. At first, I only merged a record of those commits that do not require merging, and then I did
svn merge ^/trunk
it, and this already led to the fact that I accidentally merged a little more than it was necessary, because. the commit arrived at the time of this merging.
By chance, I noticed this and the commit was really needed, but you might not notice, so you still have to specify the range, from the current BASE to the commit on which I decided to merge this business.