[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: Elliot Sumner <esumner_at_iFone.com>
Date: 2006-03-17 13:56:11 CET

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
repository are not correctly merged into the WC, resulting in the user
overwriting any remote changes since the last successful update.

Has been occuring from TSVN 1.2.x -> 1.3.2+

We are using:

Windows XP (sp2)
Eclipse 3.1 (happens with or without subclipse plugin)
Symantec AV
Subversion 1.1.4 via HTTP

I suspect it may be something to do with TSVN file locks, but this is
just speculation.

Jason Neylon wrote:
> Hi,
>
> We have been using TortoiseSVN for several months now and have been having
> intermittent problems with the automatic merging on update feature.
>
> Here is roughly what happens:
>
> 1. User A modified locally a file
> 2. User B modifies the file and commits to the repository
> 3. User A does an update of the file
> 4. The update report that it has merged the User B changes into the file.
> (merged/green in TortoiseSVN update window)
> 5. When user A check their working copy of the file before committing they
> notice that user A change have not been merged into their working copy of
> the file. (the working base of the file includes user B modifications.)
>
> From my understanding of the update functionality, user b modifications in
> the repository should have been merged into user A working copy of the file
> (they are to a separate section of the file so it would not have caused a
> conflict).
>
> 99% of the time the update works correctly and we have not been able to
> reproduce the problem.
>
> Also this has happened even when the file was not open in any program, which
> seems to rule out that the working copy was overwritten by user A after the
> update.
>
> We are working with the following software:
> * TortoiseSVN Version 1.3.2
> * Windows 2003 Enterprise or Windows XP (SP2)
> * Visual Studio 2005
> * Subversion Server 1.2.1 (we use the SVN protocol)
>
> This typically happens to one of the following files:
> * a large xml file that we use and modified frequently
> * Our web.config
> * Our database project file
>
> But this maybe because they are the files most frequently being edited by
> multiple users at the same time.
>
> * Has anybody noticed/experienced a similar problem? Is this a bug?
> * Any ideas on how to track the update process to help identify the problem
> * Could any other installed software be affecting the update (virus scanner
> etc? we use McAfee Managed VirusScan)
> * Any ideas/suggestions to get around this problem?
>
> Thanks for any help,
> Jason Neylon
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: users-help@tortoisesvn.tigris.org
>

-- 
Elliot Daniel Sumner
-- 
iFone Ltd - www.ifone.com
This mail is subject to: http://www.ifone.com/emaildisclaimer/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Mar 17 13:58:38 2006

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