etornick <etornick@comcast.net> wrote on 02/17/2006 10:28:32 AM:
> So the big point I take away from this is that in merging from the
Branch to
> the trunk into my local working copy I got from the trunk, the URL I
should
> use in the from and to part of the merge dialog will be the branch. I
never
> would have to use the trunk URL when merging a branch into the trunk.
Basically, yes. There are exceptions. For example, sometime you will
have a long-lived branch where you are using merge to keep the branch in
synch with trunk. If you do this, you can no longer use the changes on
the branch itself to produce the diff to send back to trunk. In this
scenario, you need to get the branch synched up with some version of
trunk. When you do the merge, you then specify trunk as the from URL and
the branch as the to URL with the appropriate revisions of each based on
the revision of trunk you were synched to. Subversion will then be
diffing trunk and the branch to figure out what is different on the branch
to apply to the WC.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Feb 17 16:48:19 2006