[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge --reintegrate after a mv in the branch (SVN 1.5.0 / Windows)

From: Philippe Andersson <pan_at_iba-group.com>
Date: Wed, 02 Jul 2008 12:23:36 +0200

Follow-up on my own post: this is known issue #3128:


But I'd still like an answer to my 2 questions:

- Is there a workaround ?
- Is this something that will get fixed in the upcoming 1.5.1 ?

It looks to me like a rather major show-stopper.

Ph. A.

Philippe Andersson wrote:
> Hello list,
> Baeriswyl Kuno - Extern (IT-BA-MV) wrote:
>> Hello Thomas,
>> I've got the same issue. After 1 day playing with stable 1.5 build,
>> I've got the impression that the repository turns quickly in a stange
>> state after moving a file. Even in the situation were you do a file
>> move prior to a branch, the reintegration is not possible anymore.
>> And for future branches too.
>> It seems that the merge tracking feature hasn't been fully
>> implementend (See Release notes). However, I'd liked to know with
>> scenarios are actually supported. I tried to gather information from
>> different sources. In my point of view, feature branches and
>> bidirectional merging are not well supported.
> I haven't seen any follow-up on the post above. I'm busy evaluating
> 1.5.0 (on Linux in my case), and I've been bitten by the same
> problem/bug apparently.
> Summary of what I did:
> - upload "version 1" of project to trunk.
> - create branch "B" from trunk/LATEST.
> - upload "version 2" of project to branch "B"
> (version 2 of project implied a rename [svn mv] on one file, plus
> several additions)
> - merge (rebase) from trunk into branch "B" (no content change, only
> property change on root dir). Commit.
> - try to "merge --reintegrate" branch "B" into trunk. Fails with the
> following message:
> ---------------------------<cut>---------------------------
> taranis:~/wc/trunk$ svn merge --reintegrate
> http://taranis/repos/sysadmin/killses/branches/DEV-0001
> svn: Cannot reintegrate from
> 'http://taranis/repos/sysadmin/killses/branches/DEV-0001' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
> ---------------------------<cut>---------------------------
> Is there a workaround ? Is this something that will get fixed in the
> upcoming 1.5.1 ?
> Cheers. Bye.
> Ph. A.

*Philippe Andersson*
Unix System Administrator
IBA Particle Therapy |
Tel: +32-10-475.983
Fax: +32-10-487.707
eMail: pan_at_iba-group.com
The contents of this e-mail message and any attachments are intended solely for 
the recipient (s) named above. This communication is intended to be and to 
remain confidential and may be protected by intellectual property rights. Any 
use of the information contained herein (including but not limited to, total or 
partial reproduction, communication or distribution of any form) by persons 
other than the designated recipient(s) is prohibited. Please notify the sender 
immediately by e-mail if you have received this e-mail by mistake and delete 
this e-mail from your system. E-mail transmission cannot be guaranteed to be 
secure or error-free. Ion Beam Applications does not accept liability for any 
such errors. Thank you for your cooperation.

Received on 2008-07-02 12:24:19 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.