Is it safe (with modern Subversion) to "reintegrate" more than once?

Question

If I make a branch 35.1-extra from the 35.1 branch (release branch obviously), do some work, and then after some time merge stuff from 35.1-extra back into 35.1, is it OK to merge more than once?

I remember this was problematic in old versions of Subversion so whenever I reintegrate, I either created a new branch if I had to do some extra work, or re-created the "extra" branch, and continued working there.

bahrep · Accepted Answer · 2014-08-08T14:42:11.767

2

You had to keep a reintegrated branch alive with Subversion 1.7 and older clients. Thanks to the new "automatic reintegration merge" feature in Subversion 1.8 release, so called "keep-alive dance" is no longer necessary:

svn merge automatically detects whether reintegration merge has to be done,
--reintegrate option of svn merge is deprecated in SVN 1.8+.

edited Aug 08 '14 at 14:42

answered Aug 08 '14 at 14:24

bahrep

29,961
12
103
150

Yep, that is basically what guys from the IRC #svn channel told me. – DejanLekic Aug 08 '14 at 14:25

score 1 · Answer 2 · answered Aug 08 '14 at 11:33

1

Apparently, this old problem has been fixed in Subversion 1.8 - http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate .

answered Aug 08 '14 at 11:33

DejanLekic

18,787
4
46
77

Is it safe (with modern Subversion) to "reintegrate" more than once?

2 Answers2