On 1/20/06, Håvard Vold <hovoid@hotmail.com> wrote:
> 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 :
>
> <snip>
> 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!
> <snip>
>
> 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
> commit.
>
> Is there any way or place to recover the changes that my colleague had
> entered before he go 'merged'?
What subversion client is this? What is this merge manager? And surely
this merge manager shows conflicts and allows a user to resolve them,
not just automatically overwrite any local changes?
/Johan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 20 15:30:12 2006