Re: Re: Merging moved files

* Simon McClenahan <smcclenahan@healthcompartners.com> [2004-05-17 10:11]:
> Has an issue been reported, and can I track the progress? This is
> actually a big issue for me right now, since I made a whole lot of
> changes, and need to merge them back into our trunk. Since I can't
> really rely on the Subversion developers to fix this in a timely manner,
> I'm going to have to figure out a way to do this painstakingly one dir
> at a time.

There's not an issue for this that I can find. I think you should
definitely file one, and include the transcript you posted to the list.

> So the question I have now is, how do I perform this? The easiest, and
> possibly the only sane way to do this that I can think of is to view the
> log of the trunk then merge each dir with changes into the reorg branch
> moved directory, then merge the reorg branch back into the trunk. I
> can't see how it is possible to merge the reorg branch moved dirs
> directly back to the trunk dirs original location.

Yeah, since the trunk changes don't make it through the merge, that
seems like the least painful way to get around it. Sorry I don't have
any better suggestions :-(

-- Mike

-- 
Michael W. Thelen
The greatest of all weaknesses is the fear of appearing weak.
                -- J.B. Bossuet, "Politics from Holy Writ", 1709