Re: How to merge branch back to trunk when branch is in sync with trunk

haller-at-ableton.com (Stefan Haller) |Lists| wrote:
> No, this is wrong. It will often work, because Subversion notices that
> the trunk you're merging into already contains most of the changes you
> are trying to merge into it; but it doesn't always work, and it is not
> the correct way to do it.

What is wrong about this? In what situations won't it work, what is
"incorrect" about it?

> Instead, merge the differences between trunk@150 and branch@HEAD into
> the trunk. You need to be very careful that the branch really contains
> all the changes from trunk up to r150, otherwise you will revert the
> ones that it doesn't contain.

Yikes! Loosing changes to the trunk is the absolute last thing that must
ever happen. "You need to be very careful that the branch really
contains all the changes from trunk up to r150" How does one *ensure*
that if there 1047 changes/revisions on the trunk in that period, so
that manual checking is unfeasable/impossible?

I use Claude's suggestion and would like to hear how that can't work.
Sure, there can be merge conflicts, but no changes to trunk are ever
lost which is the preferable way in my opinion.

Peter

-- 
Peter Valdemar Mørch
http://www.morch.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org