Shouldn't --reintegrate used with a 2-URL merge perform checks?
From: Brandt, Servatius (External) <servatius.brandt.external_at_ts.fujitsu.com>
Date: Tue, 29 Jun 2010 16:26:49 +0200
This is an suggestion to improve the --reintegrate option to perform
This would be helpful in the following scenario:
Beside the trunk there are two branches
"feature" from trunk:50,
all at the top of the repository.
All trunk changes up to r100 have been merged into "feature" and
I would like to use the commands
to integrate the new feature into the release branch (agile release
1. Check that the working copy WC-release of "release" is clean
However, the command above seems to execute simply
svn merge ^/trunk_at_HEAD ^/feature_at_HEAD
(Actually, I did not check 2 and 3, but 1, 4, 5 are missing from my
The problem is that this removes the change made in r105 from "release"
It would be helpful if
would perform similar steps as
should then do exactly the same as the 1-URL command just mentioned.
Extending the --reintegrate checks on the 2-URL merge would save users
Thanks for your time,
This is an archived mail posted to the Subversion Dev mailing list.