Re: commiting trunk checkout to a branch

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