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

Re: tracking changes across rename

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-09-27 13:35:29 CEST

On Sep 27, 2005, at 06:37, Peter Selinger wrote:

> Create a directory project1 (revision 1)
> In directory project1, create a file file1. (revision 2)
> Copy directory project1 to project2 (i.e., make a branch).
> (revision 3)
> In project 2, rename file1 as file2. (revision 4)
> In project 1, make some textual change to file1. (revision 5)
>
> Now I tried to merge the change from project1 into project2 as
> follows:
> in an updated working copy of project2:
>
> svn merge -r4:5 file:///tmp/svnrepos/project1
>
> I expected that SVN would remember that file1 in project1 corresponds
> to file2 in project2, and therefore would merge the change made to
> file1 in revision 5 (perhaps the correction of a spelling mistake)
> into file2 in project2. However, this is not what happened. Instead, I
> just got the message
>
> Skipped missing target: 'file1'
>
> So it seems that merge behaves exactly the same as it would have,
> e.g., in CVS, i.e., it simply applies a flat patch.
>
> How can I get SVN to do "the right thing"?

Subversion currently does not do what you want in this case. If you
rename a file in a branch, and someone makes changes to the original
in the trunk, you're going to run into the problem you're running
into. There are bugs open for this.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 27 13:37:58 2005

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