Simon Large <slarge <at> blazepoint.co.uk> writes:
> However, all the examples in the SVN book actually use the alternate
> form and there is a warning in the "Common Use Cases for Merging"
> section about doing it that way. Normally you want to merge a range of
> changes from your branch back into the trunk (or vice versa).
Admittedly, I'm not an SVN or TSVN expert, but from my reading of the SVN book
it sounds like they have two patterns of doing development within branches.
In the first, you create a branch, commit changes to it, and then merge those
changes back to the trunk. You can then either continue additional work with
your branch, or delete it. But you never pull other changes committed to the
trunk down into your branch when following this pattern. As a result, to merge
your changes back to the trunk you simply pick the starting revision of your
branch changes and the ending revision of your branch changes as the "from" and
"to" trees to "diff" and then merge that "diff" back into the trunk. TSVN seems
to work fine with this pattern from what I can tell.
In the second, which admittedly has less coverage in the SVN Book, you create a
branch, make changes to it, pull down changes from the trunk into it
periodically, and then promote your changes to the trunk. Because your branch
already contains the changes made to the trunk, and you don't want to re-apply
those changes to the trunk again, you want to "diff" your branch@HEAD with the
trunk@HEAD as the two trees, and then merge that "diff" back into the trunk.
This is the one I'm having problems with.
FWIW, I'm trying to do the second pattern because we have some large features
that will take awhile to develop but we don't want to get too out of sync with
the trunk -- that would risk alot of conflicts and problems. Unless I'm missing
something, if we sync our banch to the trunk periodically, then the only way to
find the changes made in just our branch is to diff the two head revisions.
----
Dave Peterson
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 18:45:17 2005