Bug Report: Merge failure

[Blake, Jeff]

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.

Jeff Blake, P.Eng.
Building Energy Simulation Tools | Outils de simulation de bâtiment
Sustainable Buildings & Communities | Bâtiments et des collectivités durables
CanmetENERGY | CanmetÉNERGIE
580 rue Booth Street, Ottawa, Ontario Canada K1A 0E4
[phone]       Fax: [phone]
www.canmetENERGY.nrcan.gc.ca | www.canmetÉNERGIE.rncan.gc.ca

[Stefan Küng]

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@...].

[Blake, Jeff]

Version 1.6.6, Build 17493 - 32 bit

Jeff

-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn@...]
Sent: November 12, 2009 2:35 PM
To: users@...
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@...].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2417315

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].