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

Bug Report: Merge failure

From: Blake, Jeff <Jeff.Blake_at_NRCan-RNCan.gc.ca>
Date: Wed, 11 Nov 2009 20:41:40 -0500

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
(613) 992-5672 Fax: (613) 996-9909
www.canmetENERGY.nrcan.gc.ca | www.canmetÉNERGIE.rncan.gc.ca

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

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

TortoiseError.gif
Received on 2009-11-12 02:46:39 CET

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