2 users working on same file caused a change to be reverted rather than merged
From: Rupert Hunt <rupert_at_pagedevelopers.com>
Date: Sat, 14 Feb 2009 09:55:22 +0000
Hello
After a few months of using svn and everything behaving as it should do,
There are 2 developers working on their own working copies, committing to a
Yesterday, both were working on the same file.
Developer 1 added a few lines around line 10 but then changed his mind and
Developer 2 commented out some lines around line 100 and added some
Developer 2 commits the change.
Developer 1 later commits, but instead of svn failing and returning the
Revision history confirms this sequence.
Does anyone know why this might have happened? The only unusual thing we
Many thanks for any help you can give
Rupert
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.