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

TortoiseSVN Merge Error

From: Chris Herrick <cherrick_at_menard-inc.com>
Date: Tue, 11 Aug 2009 10:43:55 -0500

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
Internet & Store Systems
(715) 876-2576


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

This communication constitutes an electronic communication within the meaning of the Electronic Privacy Act, 18 U.S.C. 2510, et. seq. Disclosure of this communication is strictly limited to the intended recipient. This communication and its contents and attachments, if any, are confidential and may contain information that is privileged or otherwise exempt from disclosure under applicable law. Receipt by any person or entity other than the intended recipient does not constitute waiver or loss of the confidential or
privileged nature of this communication. Any review, dissemination, copying, resubmission, transfer, or distribution in any form by any person or entity other than the intended recipient is strictly prohibited. If you are not the intended recipient, please notify the sender immediately and delete any and all copies of this communication and any attachments. Failure to abide by these provisions will result in legal and equitable action taken against you, as identified in 18 U.S.C. 2520-21.

TortoiseSVN Merge Error.png
Received on 2009-08-11 17:53:10 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.