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

RE: Intermittent failure to merge changes into working copy when doing updates

From: Jason Neylon <jneylon_at_porism.com>
Date: 2006-03-23 17:23:55 CET

>Are you sure you do not have the file open in any editor during the update?
That could cause the merge to be overwritten >once you save the file again
in your editor...
>
>--
>Regards,
>
>Jean-Marc

Hi Jean,

I do not know about Elliot's case but this does not seem to be the case for
us. This has been reported when the files in question were not open in an
editor. Should I precede to log this as bug?

Thanks,
Jason

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 23 17:24:15 2006

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

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