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

Re: To Merge or copy a feature branch?

From: Gavin Baumanis <gavinb_at_eclinic.com.au>
Date: Thu, 17 Sep 2009 00:22:25 +1000

Ahhh. I see...

You're correct Bob.. I have worded my original post incorrectly...
your assumption is correct.

branches/project1/feature1 is indeed going to;


On 17/09/2009, at 00:11 , Bob Archer wrote:

>> I have created a branch for a new feature I am working on and am now
>> ready to merge my branch back to the trunk.
>> All files of the new work (But for a couple) are in a new sub
>> directory.
>> Ie.
>> I have;
>> trunk/project1
>> branches/project1/feature1
>> I was thinking of simply copying the feature1 folder and all contents
>> into trunk/project1 (via svn copy) as opposed to doing a merge...
>> Is this a good practice? Or should I perform the needed task via a
>> merge operation?
> I don't understand... why did you add the feature1 folder in the
> branch? Is that going to end up in trunk?
> It seems to me if you copy feature1 to trunk then you will have a
> problem. Or, did you mean you want to copy branches/project1/
> feature1 to trunk/project1/feature1 ???
> BOb

As always Please contact me if I can be of any further assistance.

Gavin "Beau" Baumanis
Senior Application Developer
PalCare P/L

657 Nicholson Street
Carlton North
Victoria, Australia, 3054

E: beau_at_palcare.com.au
P: +61 -3 9380 3513
M: +61 -438 545 586
W: http://www.palcare.com.au


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 16:24:13 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.