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

Move a file in a brach and merge

From: Luigi Paioro <luigi_at_lambrate.inaf.it>
Date: 2006-03-10 10:38:14 CET

Hi again!

I have another question for Subversion gurus.

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.

That's right?



To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 10 10:39:15 2006

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