branch creation - merge not working?
From: Brian Lindahl <lindahlb_at_hotmail.com>
Date: Fri, 17 Dec 2010 10:06:33 -0700
Using SilkSVN as my DOS client (actually using TortoiseSVN, but
The typical workflow is (in Subversion verbage):
Release planning:
Development:
Release delivery:
A project layout is typically like this:
TestProject/
I'm having a problem with this step of the process:
I was able to merge trunk into integration/release2/, and the expected files are created. However, when I merge integration/release2/ into softwareTeamMember1/branchName1/, none of the expected files are created. However, when I merge trunk into softwareTeamMember1/branchName1/, the expected files are created. Why?? And how do I get the workflow that we are used to operating under with Subversion?
C:\TestProject\branches\integration\release2>svn list
C:\TestProject\branches\software1\issue34>svn list
C:\TestProject\branches\software1\issue34>svn merge https://localhost/svn/TestProject/branches/integration/release2@HEAD .
C:\TestProject\branches\software1\issue34>dir
Directory of C:\TestProject\branches\software1\issue34
12/17/2010 09:22 AM <DIR> .
C:\TestProject\branches\software1\issue34>svn propget svn:mergeinfo .
C:\TestProject\branches\software1\issue34>svn merge https://localhost/svn/TestProject/trunk@HEAD .
C:\TestProject\branches\software1\issue34>svn propget svn:mergeinfo .
|
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.