[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: Michael W Thelen <thelenm_at_cs.utah.edu>
Date: 2004-04-02 00:38:18 CEST

* Tim Armes <tarmes@fr.imaje.com> [2004-04-01 09:52]:
> 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.

I would strongly suspect that this is a user problem, perhaps the text editor
behavior mentioned by Lorenz Minder. Do your developers run 'svn diff' before
committing to make sure they are committing exactly the changes they think
they are? This is a good policy in general, and would help to make it clear
whether the problem is really a user problem or a Subversion problem.

-- Mike

Michael W. Thelen
Under capitalism, man exploits man.  Under communism, it's just the opposite.
                -- John Kenneth Galbraith

  • application/pgp-signature attachment: stored
Received on Fri Apr 2 00:39:59 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.