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
Hello,
I would like to test what is still a known limitation : merge tracking
For my test, I'm doing this :
In a trunk wc, add a simple file (file.txt)
And svn is answering this :
While reading svn book, Chap.4 Advanced Merging, Merge & Moves
Can somebody explain me how to "force" the branch reintegration ?
After googling, I didn't find a lot of help on how to handle such a
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
Committed revision 1.
D:\Tmp\svnreintegrate>rmdir /s reintegrate
D:\Tmp\svnreintegrate>dir
Répertoire de D:\Tmp\svnreintegrate
26/06/2008 11:38 <REP> .
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 .
D:\Tmp\svnreintegrate\trunkwc>svn copy
Committed revision 2.
D:\Tmp\svnreintegrate\trunkwc>cd ..
D:\Tmp\svnreintegrate>cd branchwc
D:\Tmp\svnreintegrate\branchwc>svn co
D:\Tmp\svnreintegrate\branchwc>svn mv file.txt fileRenamed.txt
D:\Tmp\svnreintegrate\branchwc>svn commit -m "refactoring done"
Committed revision 3.
D:\Tmp\svnreintegrate\branchwc>cd ..
D:\Tmp\svnreintegrate>cd trunkwc
D:\Tmp\svnreintegrate\trunkwc>svn update
D:\Tmp\svnreintegrate\trunkwc>svn merge --reintegrate
D:\Tmp\svnreintegrate\trunkwc>svn --version
Copyright (C) 2000-2008 CollabNet.
The following repository access (RA) modules are available:
* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
---------------------------------------------------------------------
|
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.