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

RE: Bug Report: Merge failure

From: Blake, Jeff <Jeff.Blake_at_NRCan-RNCan.gc.ca>
Date: Thu, 12 Nov 2009 18:43:23 -0500

Version 1.6.6, Build 17493 - 32 bit

Jeff

-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Sent: November 12, 2009 2:35 PM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Bug Report: Merge failure

Blake, Jeff wrote:
> The attached message occurred when I attempted to merge the main trunk
> of a repository with a branch created from the trunk six months ago.
> Note that a "Test merge" was done first and successfully completed. I
> used all of the default settings for the merge. Even though the merge
> failed all of my source files were marked as changed but a dif showed
> no differences with the repository.
>
> <<TortoiseError.gif>>
> I have since attempted the merge after a "Clean up" with the same
> result. I am now creating a new sandbox to attempt another merge.

Which version of TSVN are you using?

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=2417199
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2417315
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-13 00:43:33 CET

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