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

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
for mailing lists 'command line copy and paste' is easier than 'image
linking'), I'm having problems with branch creation(merge) when evaluating Subversion for our workflow.

The typical workflow is (in Subversion verbage):

Release planning:
Software Lead creates an integration branch, merging from the trunk

Software Engineer creates a work branch, merging from integration branch
Software Engineer performs work in work branch
Software Engineer re-integrates work branch back into the integration branch
(repeat x times for y engineers)

Release delivery:
Software Lead locks down integration branch (permissions become read only)
Software Lead re-integrates integration branch back into trunk
Release Engineer tags trunk

A project layout is typically like this:


I'm having a problem with this step of the process:
Software Engineer creates a work branch, merging from integration branch

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 .

 Volume in drive C has no label.
 Volume Serial Number is B0F5-5D37

 Directory of C:\TestProject\branches\software1\issue34

12/17/2010 09:22 AM <DIR> .
12/17/2010 09:22 AM <DIR> ..
               0 File(s) 0 bytes
               2 Dir(s) 218,571,730,944 bytes free

C:\TestProject\branches\software1\issue34>svn propget svn:mergeinfo .

C:\TestProject\branches\software1\issue34>svn merge https://localhost/svn/TestProject/trunk@HEAD .
--- Merging r2 through r45 into '.':
A installation-doc.txt
A .project
A sim-exe.txt
A user-guide-doc.txt
A flash-image.txt
 U .

C:\TestProject\branches\software1\issue34>svn propget svn:mergeinfo .

Received on 2010-12-17 18:07:15 CET

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.