Re: Merge from a branch of a branch to trunk, losing files
From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Fri, 24 Apr 2015 13:07:06 +0200
On Tue, Apr 21, 2015 at 7:20 PM, Robert Voliva <rvoliva_at_gmail.com> wrote:
Hi Robert,
Sorry it took a while to get a response. However, I cannot reproduce
What version are you using? Maybe this was a bug in older versions of
Below is a transcript of what I tried (I tried doing exactly what you
[[[
C:\Temp\svntest>svnadmin create repos
C:\Temp\svntest>svn mkdir -mm file:///c:/temp/svntest/repos/trunk
Committed revision 1.
C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/trunk wc-trunk
C:\Temp\svntest>cd wc-trunk
C:\Temp\svntest\wc-trunk>echo test > file1
C:\Temp\svntest\wc-trunk>svn add file1
C:\Temp\svntest\wc-trunk>svn ci -mm
C:\Temp\svntest\wc-trunk>cd ..
C:\Temp\svntest>svn cp -mm file:///c:/temp/svntest/repos/trunk
Committed revision 3.
C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/branches/branch1 wc-branch1
C:\Temp\svntest>cd wc-branch1
C:\Temp\svntest\wc-branch1>echo test > branchfile1
C:\Temp\svntest\wc-branch1>svn add branchfile1
C:\Temp\svntest\wc-branch1>svn ci -mm
C:\Temp\svntest\wc-branch1>cd ..
C:\Temp\svntest>svn cp -mm
Committed revision 5.
C:\Temp\svntest>svn co file:///c:/temp/svntest/repos/branches/branch2 wc-branch2
C:\Temp\svntest>cd wc-branch2
C:\Temp\svntest\wc-branch2>echo test > branchfile2
C:\Temp\svntest\wc-branch2>svn add branchfile2
C:\Temp\svntest\wc-branch2>svn ci -mm
C:\Temp\svntest\wc-branch2>cd ..\wc-trunk
C:\Temp\svntest\wc-trunk>svn merge
C:\Temp\svntest\wc-trunk>svn up
C:\Temp\svntest\wc-trunk>svn merge
C:\Temp\svntest\wc-trunk>dir /b
C:\Temp\svntest\wc-trunk>svn st
C:\Temp\svntest\wc-trunk>svn ci -m"merged branch2 to trunk"
Committed revision 7.
-- JohanReceived on 2015-04-24 13:07:57 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.