On Fri, Jun 27, 2008 at 9:57 AM, Tom Widmer <tom.widmer_at_googlemail.com> wrote:
> Baeriswyl Kuno - Extern (IT-BA-MV) wrote:
>>
>> Hello!
>> I've installed the collabnet build for RC9 on my windows host. I
>> followed the instructions in the Subversion Book, though, the first thing I
>> tried failed. :
>> Does anybody know a workaround or best practice for reintegrating branches
>> back to the trunk? What's the roadmap to fix this problem?
>
> Looks like a bug to me (someone else asked the same question a few hours
> earlier). I'd suggest you try the developer mailing list.
We were aware of this before we released. It kind of sits somewhere
between a bug and just a scenario we need to improve. First off,
there is nothing magical about svn merge --reintegrate. It is just a
convenient syntax for how you had to do this kind of merge before 1.5.
Namely:
svn merge url://trunk@LAST-SYNC-REV url://branch@HEAD
Where LAST-SYNC-REV is the last revision from trunk that has been
synched to the branch. You can still use this syntax with 1.5 and it
still works. Since --reintegrate is a syntax shortcut and does some
of this calculation for you, we decided (rightly or wrongly) that it
should do some checks for possible problem cases and not run the merge
if it finds any issues. The checks are relatively simple right now
and what we have to decide is how much it is worth investing in making
them smarter. In this particular case, the check is just a false
positive.
The other thing we can look at, and plan to, is whether renaming
something really needs to create subtree mergeinfo. In most cases, it
really doesn't. If no subtree mergeinfo is created, then
--reintegrate will not have a false positive.
So until these things are fixed, you either need to use the more
verbose older 2-URL merge syntax, or you have to use svn propdel to
remove the subtree mergeinfo that was created when you renamed the
files.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-28 18:29:46 CEST