[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: Wed, 16 Sep 2009 23:05:43 +1000

Thanks Andy,

pretty simple and sensible really...
But it is just so much more easier to simply copy the files!
I assumed your reply was going go to be the case.... but thought I
would get some extra advice.
In the past I have only ever merged over a specific file at specific
Or perhaps a specific file over a few revisions.
And it was always from trunk into a release tag.

I've never actually merged an entire folder before back into the trunk.


On 16/09/2009, at 20:30 , Andy Levy wrote:

> On Wed, Sep 16, 2009 at 01:46, Gavin Baumanis
> <gavinb_at_eclinic.com.au> wrote:
>> Hi Everyone,
>> 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?
> Do it as a merge. Otherwise anything that's happened in trunk will be
> lost (unless you've been merging trunk into the branch regularly). And
> either way, doing it as a merge will keep the history cleaner & more
> correct.
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395444
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_subversion.tigris.org].

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 15:06:38 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.