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

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

From: Thomas Sauzedde <thomas.sauzedde_at_gmail.com>
Date: Thu, 26 Jun 2008 12:09:11 +0200


I would like to test what is still a known limitation : merge tracking
& renaming ... and try to understand what is the best way to handle

For my test, I'm doing this :
(SVN 1.5.0 / on windows with both cmd line & tortoisesvn)

In a trunk wc, add a simple file (file.txt)
Branch the trunk to branches/refactor
In a "refactor" branch wc, rename file.txt to fileRenamed.txt
Back to the trunk wc, I'm trying to "reintegrate" my branch ...

And svn is answering this :
"svn: Cannot reintegrate from
'svn://localhost/reintegrate/branches/refactor' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry."

While reading svn book, Chap.4 Advanced Merging, Merge & Moves
I was expecting the branch to be reintegrated smoothly (while being
aware of the potential "data loss" if file.txt was updated in the
trunk) ...

Can somebody explain me how to "force" the branch reintegration ?
Am I missing something ?

After googling, I didn't find a lot of help on how to handle such a
case or any "howto" on this particular topic....
Is this use case force to abandon "merge tracking" ?

Thanks in advance

Please find below a transcript of all the operations

D:\Tmp\svnreintegrate>mkdir reintegrate

D:\Tmp\svnreintegrate>cd reintegrate

D:\Tmp\svnreintegrate\reintegrate>mkdir trunk

D:\Tmp\svnreintegrate\reintegrate>mkdir branches

D:\Tmp\svnreintegrate\reintegrate>cd trunk

D:\Tmp\svnreintegrate\reintegrate\trunk>echo > file.txt

D:\Tmp\svnreintegrate\reintegrate\trunk>cd ..

D:\Tmp\svnreintegrate\reintegrate>cd ..

D:\Tmp\svnreintegrate>svn import reintegrate
svn://localhost/reintegrate -m import'
Adding reintegrate\trunk
Adding reintegrate\trunk\file.txt
Adding reintegrate\branches

Committed revision 1.

D:\Tmp\svnreintegrate>rmdir /s reintegrate
reintegrate, êtes-vous sûr (O/N) ? o

 Le volume dans le lecteur D s'appelle DATA
 Le numéro de série du volume est 3022-4211

 Répertoire de D:\Tmp\svnreintegrate

26/06/2008 11:38 <REP> .
26/06/2008 11:38 <REP> ..
               0 fichier(s) 0 octets
               2 Rép(s) 11 194 564 608 octets libres

D:\Tmp\svnreintegrate>mkdir trunkwc

D:\Tmp\svnreintegrate>mkdir branchwc

D:\Tmp\svnreintegrate>cd trunkwc

D:\Tmp\svnreintegrate\trunkwc>svn co svn://localhost/reintegrate/trunk .
A file.txt
Checked out revision 1.

D:\Tmp\svnreintegrate\trunkwc>svn copy
svn://localhost/reintegrate/branches/refactor -m "create branch for

Committed revision 2.

D:\Tmp\svnreintegrate\trunkwc>cd ..

D:\Tmp\svnreintegrate>cd branchwc

D:\Tmp\svnreintegrate\branchwc>svn co
svn://localhost/reintegrate/branches/refactor .
A file.txt
Checked out revision 2.

D:\Tmp\svnreintegrate\branchwc>svn mv file.txt fileRenamed.txt
A fileRenamed.txt
D file.txt

D:\Tmp\svnreintegrate\branchwc>svn commit -m "refactoring done"
Deleting file.txt
Adding fileRenamed.txt

Committed revision 3.

D:\Tmp\svnreintegrate\branchwc>cd ..

D:\Tmp\svnreintegrate>cd trunkwc

D:\Tmp\svnreintegrate\trunkwc>svn update
At revision 3.

D:\Tmp\svnreintegrate\trunkwc>svn merge --reintegrate
svn: Cannot reintegrate from
'svn://localhost/reintegrate/branches/refactor' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.

D:\Tmp\svnreintegrate\trunkwc>svn --version
svn, version 1.5.0 (r31699)
   compiled Jun 23 2008, 12:59:48

Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme

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-26 12:10:04 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.