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

Re: Merges lost

From: Lorenz Minder <lminder_at_gmx.net>
Date: 2004-04-01 23:51:28 CEST

Tim Armes wrote:
> We seem to be having an occassional (and unreproducable problem) whereby a
> developer will update their local working copy which results in files being
> merged automatically. Once committed however, it becomes apparent that the
> merged files are actually not merged, and that the version now in the
> repository is that of the developer - i.e. the previous changes made before
> his update are no longer in the head revision.
> For the moment this is all the information that I have. Is this a known
> problem?


I have sometimes seen this happen with people using texteditors which
don't warn when trying to save files which have changed on disk since
loaded. Consider the following:

* User 1: checkout/update
* User 2: checkout/update
* User 1: edit, save, commit
* User 2: edit, then "svn update" in seperate terminal
        -> User 1's changes are locally merged
* User 2: continues editing w/o having reloaded the file in the
editor (Hence, he still edits the old, unmerged version.)
* User 2: save, commit
        -> User 1's commit has gone.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 2 00:01:06 2004

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

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