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

RE: RE: RE: Merging branch into trunk

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-12-20 16:20:08 CET

Hmm, you're probably correct in the case for branch tags, since
the branch will ONLY be used once, since it addresses a particular
issue. The sequence

> cd /trunk_workspace
> svn merge <creation_branch_revision)>:HEAD //repos/project/branches/SC999

...will indeed work to merge branch changes

However, tags on the trunk are still necessary to merge trunk
deltas from the time of branch creation, unless users want to
keep track on when the last trunk revision was merge to their
branches.

Tags are NOT necessary, just convenient!

>-----Original Message-----
>From: Méresse Christophe [mailto:christophe.meresse@nagra.com]
>Sent: Wednesday, December 20, 2006 10:06 AM
>To: users@subversion.tigris.org
>Subject: RE: RE: Merging branch into trunk
>
>I'm sorry but all that merge question has nothing to do with tags.
>The tags as they are used here are just a way too keep a trace
>of the merge or of the branch creation revision, but nothing
>else. Personally I think that it does just make the things
>more confused.
>
>You should be able to do the merge without any tags just
>giving the creation of branch SC999 revision number.
>
>- Created a branch on the trunk (you've done it yet)
> > svn cp //repos/project/trunk //repos/project/branches/SC999
> (Note the Creation branch revision)
>
>- Do development on the branch, so now there's a delta between
>branch and trunk code (you've done it yet)
>- Commit changes to branch (you've done it yet)
>
>- Merge delta into trunk (Be sure that your trunk_workspace
>workspace is on the trunk if ever you have switch it to work
>on the branch it will not work)
> > cd /trunk_workspace
> > svn merge <creation_branch_revision)>:HEAD
>//repos/project/branches/SC999
> (resolve conflicts, there should not have any conflict if
>nothing has been done on the trunk)
> > svn commit
>
>If you are sure that nothing has been done on the trunk you
>can do also:
>- Merge delta into trunk
> > cd /trunk_workspace
> > svn merge //repos/project/trunk //repos/project/branches/SC999
> > svn commit
>
>Regards
>Christophe
>
>> -----Original Message-----
>> From: Chris.Fouts@qimonda.com [mailto:Chris.Fouts@qimonda.com]
>> Sent: mercredi, 20. décembre 2006 15:14
>> To: Steve.Nelson@uk.delarue.com; users@subversion.tigris.org
>> Subject: RE: Merging branch into trunk
>>
>>
>> Ah, you must NOT have created tags when you branched. 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
>> - Do development on the branch, so now there's a delta between branch
>> and trunk code
>> - Commit changes to branch
>> - Merge delta into trunk
>> > cd /trunk_workspace
>> > svn merge //repos/project/tags/SC999-trunk
>> //repos/project/branches/SC999
>> > (resolve conflicts)
>> > svn commit
>>
>> 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.
>>
>> 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
>>
>> Read more info on branches and tags.
>>
>> >-----Original Message-----
>> >From: Steve.Nelson@uk.delarue.com
>> [mailto:Steve.Nelson@uk.delarue.com]
>> >Sent: Wednesday, December 20, 2006 7:58 AM
>> >To: users@subversion.tigris.org
>> >Subject: Merging branch into trunk
>> >
>> >
>> >Hello,
>> >
>> >From reading the svn book, it seems that merging a branch back into
>> >the trunk takes the form of providing svn merge with three
>arguments
>> >- the original revision, the new revision, and the current working
>> >copy.
>> >
>> >I've created a branch /branches/SC999 and copied a program into it,
>> >and made and committed changes to foo.p.
>> >
>> >If I want to merge /branches// into /trunk, I try, from within my
>> >working copy:
>> >
>> >svn merge /trunk@23 /branches/SC999@26
>> >
>> >After this, nothing seems to have changed - it seems no diff took
>> >place, and no change.
>> >
>> >I've tried various alternatives:
>> >
>> >svn merge https://svntest/repos/devrep/dlr/trunk/dxzz00em0001.p@23
>> >https://svntest/repos/devrep/dlr/branches/SC999/dxzz00em0001.p@26
>> >
>> >svn merge -r 23:26 https://svntest/repos/devrep/dlr/trunk
>> >
>> >All seem to have no effect. What am I doing wrong?
>> >
>> >Steve Nelson
>> >Technical Analyst
>> >De La Rue plc
>> >De La Rue House, Jays Close
>> >Basingstoke, Hampshire, RG22 4BS
>> >(T) +44 (0)1256 605179
>> >(M) +44 7764 286 356
>> >(F) +44 (0)1256 605094
>> >steve.nelson@uk.delarue.com
>> >http://www.delarue.com
>> >
>> >*************************************************************
>> *********
>> >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
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 20 16:22:31 2006

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