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

RE: Merging branch into trunk

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-12-20 15:45:35 CET

>-----Original Message-----
>From: Steve.Nelson@uk.delarue.com [mailto:Steve.Nelson@uk.delarue.com]
>Sent: Wednesday, December 20, 2006 9:21 AM
>To: Fouts Christopher (QNA RTP PT PREV); users@subversion.tigris.org
>Subject: RE: Merging branch into trunk
>
>
>> -----Original Message-----
>> From: Chris.Fouts@qimonda.com
>[mailto:Chris.Fouts@qimonda.com] Ah, you
>> must NOT have created tags when you branched.
>
>Ah, no, I've not done anything with tags - will go and study this.
>
>> If done correctly, you should've
>>
>> - Created a tag on the branch to signify when you branched
>> > svn cp //repos/project/branches/SC999
>> //repos/project/tags/SC999-trunk
>
>Ok, so I've not done any tagging.
>
>> - Do development on the branch, so now there's a delta between branch
>> and trunk code
>
>Done that.
>
>> - Commit changes to branch
>
>Done that.
>
>> - Merge delta into trunk
>> > cd /trunk_workspace
>
>Aha... so here, do I need to have checked out the trunk as
>well as just the branch I am working on? As per previous
>thread, my trunk is very large, so I'm not keen on requiring
>users to check out the trunk to make merges. Is this unavoidable?
>
>> > svn merge //repos/project/tags/SC999-trunk
>> //repos/project/branches/SC999
>
>Again... reference to tags. Will read about this.
>
>> > (resolve conflicts)
>
>Right. Have read about this.
>
>> > svn commit
>
>/me nods.
>
>> What you can do is make a new branch, tag the branch as above, then
>> "manually" copy the files from your "other branch workspace"
>into this
>> new branch workspace, commit, then merge.
>
>OK. I'll have a try with this.
>
>> You also need to tag the trunk so you can merge trunk deltas
>into your
>> branch
>> > svn cp //repos/project/trunk //repos/project/tags/trunk-branchname
>
>I don't see how simply doing that copy does anything more than
>making a complete copy of the trunk. Have I missed something?
>
>> Read more info on branches and tags.
>
>On my way!
>
>S.
>
>

To answer your last question, in Subversion, yes a "tag" is
essentially a copy of what you are tagging. So tagging the
trunk "copies" the trunk. What this enables you to do is
merge trunk deltas to a branch
> cd to /branch_workspace
> svn merge //repos/project/tags/trunk-branchname //repos/project/trunk

To answer your questions merging onto trunk, yes you would have to check
out the "whole" trunk, since in Subversion, you just can NOT check out
a file (one of its weaknesses IMHO). The good thing is you only have to
do this once (per user).

> svn co //repos/project/trunk/dir/foo.h
svn: URL 'svn+ssh://repos/project/trunk/dir/foo.h' refers to a file, not
a directory

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 20 15:47:45 2006

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