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

Clobbering source file through merge -- can I recover?

From: Håvard Vold <hovoid_at_hotmail.com>
Date: 2006-01-20 14:46:18 CET

A colleague checked a folder out some time ago, made mods, and tried to
commit. He got clobbered and confused as shown in his comment :

The one thing subversion DID do was to detect a conflict in my version of
"Medallion.cpp" It brought up the merge manager, then promptly
overwrote my version of that file with some other version. Thus, all my
changes to "Medallion.cpp" were destroyed. This is a serious setback
as most of my licensing changes were made to that file!

Unbeknownst to my colleague, this file had been modified and committed by
another programmer, so I belive that he did not update before trying to

Is there any way or place to recover the changes that my colleague had
entered before he go 'merged'?


Express yourself instantly with MSN Messenger! Download today - it's FREE!

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 20 14:49:25 2006

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

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