[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: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: 2006-03-17 15:03:28 CET

Elliot,

> I can confirm we are getting the same problem. It does appear to be related
> to any file that is concurrently modified quite often; changes from the

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
----------------
    ___
   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Mar 17 15:04:08 2006

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