[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging when target has moved files

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-05-07 02:56:10 CEST

On May 6, 2005, at 1:21 PM, Seth Daniel wrote:

> Hello,
>
> 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.
>
> In the past I haven't had to deal with moved files. The files in the
> branch had the same names as on the trunk. In the past when I have
> wanted to merge the trunk with the branch I would do something like
> this
> (using the above example):
>
> cd B01_working_copy/
> svn merge -r 32:HEAD http://site.com/svn/project1/trunk
>
> and everything worked as expected.
>
> But now, with the moved files, the changes to F in the trunk are not
> merged with NF in the branch. Instead, a file named F is created
> in the
> branch and NF is unchanged. I would expect/hope that F would be
> merged
> with NF.
>
> I have a transcript of what I'm talking about, but it is rather
> lengthy
> and I was hoping someone would look at the above example and would
> instantly know what I was doing wrong.
>

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 7 03:00:19 2005

This is an archived mail posted to the Subversion Users mailing list.