Re: merging when target has moved files

On Fri, May 06, 2005 at 07:56:10PM -0500, Ben Collins-Sussman wrote:
> On May 6, 2005, at 1:21 PM, Seth Daniel wrote:
> >I have a repository with a single project. This project has a trunk
> >and a single branch named B01. The branch was made at revision 32.
> >Since the branch was made some modifications have been made to a file
> >named F on trunk. Also, in the branch, the file named F was svn
> >moved to NF.
[..snip...]

> Subversion doesn't have moves, it has copies & deletes. Alas, this
> is currently expected behavior. When the server sends a "move" to a
> client, it just adds a file and deletes a file, rather than really
> moving things. We hope to fix this soon, it's been discussed as part
> of our 'true moves' discussion on the dev@ list.

I suppose I actually knew this but I just hadn't made the connection to
merges for some reason.

Okay, so now I'm wondering what people do when they need to do a large
repository reorganization while simultaneously allowing development to
go on on the trunk.

I guess I could simply do the reorganization on the trunk. That would
simplify things. Maybe.

In the trunk + reorg branch case I suppose the only real thing I can do
is keep track of the files that are changed on trunk and what the new
file name is on the reorg branch and write a script that can merge the
trunk file to the new reorg branch file. Then when I am done with the
reorg I can run the script to sync up the branch to trunk and then I can
merge the branch to trunk.

Well, here's to 'real moves'. I can't wait. :o)

-- 
seth / @sethdaniel.org
I told my kids, "Someday, you'll have kids of your own." One of them
said, "So will you."
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org