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

Merge question

From: CoolBreeze <coolbreeze812_at_googlemail.com>
Date: Thu, 4 Mar 2010 14:29:33 -0500

I'm getting back into using Subversion and I'm not sure how to answer a
question a co-worker asked me regarding merging. Can someone please explain
how the following is handled with the following repository structure of our
ASP.NET Intranet site?

Our repository is structured below:

   - Trunk
   - Branches
   - Tags

Now having all production source code witin the Trunk and development within
the Branches, if I'm working on the source of a particular sub-program
within the Branches as well as another developer is working a different
source file also under the same Branch, I've completed my work and am ready
for my changes to be merged back into the Trunk. Is it possible to merge
only my changes back into the Trunk? Becuase the other developer is Unit
Testing his source files, but he's not ready for his changes to be put into
the Trunk yet.

I hope this was clear.

Received on 2010-03-04 20:30:10 CET

This is an archived mail posted to the Subversion Users mailing list.