[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-04-01 18:07:50 CEST

On Thu, 2004-04-01 at 03:13, 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?

Never heard of a such a problem, ever. And it's hard for me to believe,
honestly, because a bug this fundamental should have been easily spotted
over the course of four years of development and testing.

My suspicion is that the symptom of your problem (losing local
modifications) is coming from a complex mixture of user actions which
result in accidental data loss. (PEBKAC, in other words.) But hey, I
could be wrong. It would be fantastic if you can find a way to

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 1 18:08:42 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.