>-----Original Message-----
>From: Steve.Nelson@uk.delarue.com [mailto:Steve.Nelson@uk.delarue.com]
>Sent: Wednesday, December 20, 2006 9:44 AM
>To: Steve.Nelson@uk.delarue.com; Fouts Christopher (QNA RTP PT
>PREV); users@subversion.tigris.org
>Subject: RE: Merging branch into trunk
>I checked, and indeed the changes in SC999 were merged into the trunk.
>
>I then did:
>
>$ svn merge https://svntest/repos/devrep/dlr/trunk/dxzz00em0001.p
>https://svntest/repos/devrep/dlr/branches/SC1230/dxzz00em0001.p
>$ svn commit -m "merge done with sc1230?"
>
>Upon checking, the changes in sc1230 were there, but the changes from
>sc999 were over-written, and there was no conflict message.
>The change was just a comment at the top of the program.
>
>What have I done wrong?
>
>S.
>
The problem is you did NOT merge the trunk changes to your sc1230 branch
AFTER you merge the SC999 changes into the trunk! Now you understand why
you need to tag the trunk! :) So here's the correct chronological order
of branching/merging/tagging, using your scenario
> Branch SC999 from trunk
> tag branch points on BOTH trunk and branch for SC999
> code, code, code on SC999 branch
> merge trunk from branch (to pick up any deltas since branching)
> commit onto branch
> check out trunk
> cd to trunk workspace
> merge branch onto trunk
(the following can happen before or after above)
> Branch sc1230 from trunk
> tag branch points on BOTH trunk and branch for sc1230
> code, code, code on sc1230 branch
> merge trunk from branch (to pick up any deltas since branching)
> commit onto branch
> check out trunk
> cd to trunk workspace
> merge branch onto trunk
You missed the step in merging from trunk to branch!
---------------------------------------------------------------------
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:57:41 2006