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

Re: commiting trunk checkout to a branch

From: Olivier Sannier <obones_at_free.fr>
Date: Sat, 24 Oct 2009 19:45:04 +0200

Hello,

What you need to do is to merge the changes from trunk into your branch
then reintegrate the branch into the trunk.
To merge, to this:

svn merge /url/to/trunk WorkingCopyOnBranch
Review the changes
svn commit WorkingCopyOnBranch

Then, to reintegrate, do this

svn merge --reintegrate url/to/branch WorkingCopyOnTrunk
Review the changes
svn commit WorkingCopyOnTrunk

All this is described here:

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonpatterns.html#svn.branchmerge.commonpatterns.feature

-- 
Olivier Sannier
olivier_at_obones.com
http://www.obones.com/
Retrouvez-moi sur Viadeo :
http://www.viadeo.com/invitationpersonnelle/0023asu3wwgwpzx
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2411070
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-24 19:46:15 CEST

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