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

Problem with merging

From: <peter.schweizer_at_gmail.com>
Date: Fri, 14 Jan 2011 14:12:56 +0100

Hi Folks,

i want to merge a branch into trunk. For that i got the first revision
of the branch with (svn log --stop-on-copy => 2854). Now i want to
merge with "svn merge -r 2854:3143 ^/branches/mybranch ." in a trunk
working dir. Svn now tries to merge the trunk not with the newest
files in the branch BUT uses revision 3095 for merging.

My question is, why does svn use the 3095 as branches' "HEAD". This
doesnt make sense to me.

Regards,
Peter
Received on 2011-01-14 14:21:53 CET

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.