advanced SVN?

Question

subversion

At work, everyone historically uses SVN (unfortunately, you can’t switch to other systems)

In the central repository, work is carried out only in one branch

. It turns out that a completed ticket may consist of several commits.

The production is updated from SVN (svn up)

There was a need to upload only a specific ticket (containing several commits) to the production.

Do I understand correctly that without using branches this is not possible?

Or is there some way, then tell me which one?

Thank you.

Answer 1

IMHO, when using one branch, you can only do svn up without taking into account the last n revisions. Well, for example, you have the latest revision 100. But I don’t want to upload the last two commits for production. Then do "svn up -r 98"
So use branches and tags. Actually it's not very difficult. We have recently switched to such a system. It became much easier for me to deploy. If you are interested, I can briefly tell you about our workflow with branches and tags.

Answer 2

You create a branch (release) in which you merge only those revisions that you need.
In general, IMHO, your workflow is incorrectly built. I recommend looking aside - 1 branch = 1 ticket. It will be easier for you to live.

Answer 3

called cherrypicking:
stackoverflow.com/questions/126320/subversion-cherry-picking

Answer 4

If I understand the question correctly, you need to make a correction (most likely a bug) in the production version. In this case, you have only one branch. You can always checkout production and try to fix the bug. Using diff, create a patch and upload it to the repository (to a separate directory with patches for this release), and also make the necessary changes to the development version. When you find a new bug, checkout the release again, apply patches (with a self-made script), edit a new bug, create a new patch.