On Mar 10, 2006, at 10:38, Luigi Paioro wrote:
> I have a main develop directory (trunk) and a branch copy (branches/
> mybr). Suppose that when I made the branch copy, there was a file
> named TODO (that was copied).
>
> Now I make a change to TODO in trunk (r123), another in branches/
> mybr (r124) and moreover a rename of TODO in branch (suppose from
> TODO to TODO.txt) (r125).
>
> I've tried to do something like this as example. Well, I've noted
> that when I merge the trunk change in the branches/mybr branch,
> than the changes are not merged in TODO.txt but an error message
> has printed:
>
> Skipped missing target: 'mybr/TODO'
>
> Now I suppose that Subversion, while is able to follow the log
> story of a changed file, is not able to follow the story of a moved
> file in order to merge the changes.
Subversion doesn't track renames quite as one might hope. It
implements a rename as a copy and then a delete, so it can't track
your situation. This is the relevant bug report:
http://subversion.tigris.org/issues/show_bug.cgi?id=898
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 10 11:26:26 2006