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

merge question

From: Holger Biebinger <holgerbiebinger_at_gmx.de>
Date: 2005-08-10 10:51:40 CEST

I have a question about merge command.
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:

trunk r110
M foo
M foo2
M foo5

A in r110
M foo2
M bar2/foo
M foo3
M foo4

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?

Thanks in advance for your help.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 10 10:49:49 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.