[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: <Steve.Nelson_at_uk.delarue.com>
Date: 2006-12-20 15:21:09 CET

> -----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.

**********************************************************************
This e-mail and any files attached are strictly confidential, may be legally privileged
and are intended solely for the addressee. If you are not the intended recipient, note
that any disclosure, copying, distribution, or use of the contents of this message and
attachments is strictly prohibited. Please notify the sender immediately by return email,
phone or fax and then delete the e-mail and any attachments immediately. The views
and or opinions expressed in this e-mail are not necessarily the views of De La Rue plc
or any of its subsidiaries and the De La Rue Group of companies, their directors,
officers and employees make no representation about and accept no liability for its
accuracy or completeness. Please ensure you have adequate virus protection before
you open any attachment as the De La Rue Group of companies do not accept liability
 for any viruses.

---------------------------------------------------------------------
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:23:20 2006

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