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

Re: TortoiseSVN Merge Error

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 12 Aug 2009 09:03:14 +0200

On 11.08.2009 17:43, Chris Herrick wrote:
> When merging changes from a renamed or deleted branch, the merge always
> fails. This appears to be the result of always trying to merge from the
> HEAD version of the repository as opposed to the selected revision which
> did contain the renamed or delete branch.
> Chris Herrick

Fixed in r16905.

Stefan 

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2382810
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-12 09:03:33 CEST

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

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