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

Re: merge question

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-08-10 14:35:34 CEST

On 10.08.2005, at 10:51, Holger Biebinger wrote:

> In revision 100 I createad a branch A for changing the project
> layout.
> In this branch, new directories where created with svn mkdir and files
> were moved with svn mv (e.g. file foo was moved to the newly added
> directory bar1/bar2/) some files were changed in trunk. Here an
> example
> for the layout:
> trunk r100:
> foo
> foo2
> foo3
> foo4
> foo5
> trunk r110
> M foo
> M foo2
> foo3
> foo4
> M foo5
> A in r110
> bar1/
> M foo2
> M bar2/foo
> bar3/
> M foo3
> M foo4
> foo5
> In my trunk working copy I tried
> svn merge -r100:110 [PATH_TO_REP]/branches/A
> to apply branch changes to the trunk. For the moved files I always get
> the "skipped missing target" message. After the merge changes
> applied to
> foo in trunk are lost.
> I thought, svn would recognize that foo in trunk is the same file
> as foo
> in A/bar1/bar2 and try to put the changes together. Am I wrong with my
> assumption or can I put together the different changes in another way?

Unfortunately, you are currently wrong with your assumption. The
Subversion team is well aware of the problem, but I think it'll take
until 1.3 or 1.4 for them to solve it. It's complicated.

The explanation has been given on this list many times but I don't
know it by heart yet so can't recite it for you. :-P I kinda thought
it would be a FAQ by now but I can't see it in the FAQ... am I
overlooking it or is it really not there?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 10 14:37:15 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.