Extending --reintegrate checks to 2-URL merge
From: Brandt, Servatius (External) <servatius.brandt.external_at_ts.fujitsu.com>
Date: Tue, 22 Jun 2010 17:06:29 +0200
This is a request for an improvement of the --reintegrate option of the
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
cd WC-release
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
cd WC-release
would perform similar steps as
cd WC-trunk
And
cd WC-trunk
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,
-- Servatius Brandt Fujitsu Technology Solutions Domagkstr. 28, D-80807 München phone: +49 89 3222 2163 e-mail: Servatius.Brandt.external_at_ts.fujitsu.comReceived on 2010-06-22 17:23:07 CEST |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.