Hi! Thanks for reply. Well it was possible. And I'm pretty sure server was 1.6 at the time. All users are using TortoiseSVN.
The revision 1174 was copied from 1112 but 1151 had replaced 1146(!!) so 1174 lost everything after 1112! Since user2 hadn't updated to revision 1173 in the "from"-branch... See extract below (I have changed it to be anonymous)! How to avoid this to happen? Regards Jan Revision: 1174 Author: user2 Date: 17:13:34, den 30 juni 2010 Message: Copied from production ---- Added : /projects/new/filename.c (Copy from path: /production/filename.c, Revision, 1112) (.........) Revision: 1151 Author: user1 Date: 07:38:28, den 30 juni 2010 Message: >From /releases/old/ ---- Replacing : /production/filename.c (Copy from path: /releases/old/filename.c, Revision, 1146) --- Den ons 2010-06-30 skrev Bert Huijben <b...@qqmail.nl>: Från: Bert Huijben <b...@qqmail.nl> Ämne: RE: out of date branches Till: "'Jan Lund'" <janne_l...@yahoo.com>, users@subversion.apache.org Datum: onsdag 30 juni 2010 17:46 Subversion doesn’t allow you to commit changes to out of date files and with Subversion 1.6 you would get a tree conflict on updating the replaced file. This tree conflict would explain that there were changes to the file that you replaced. Bert From: Jan Lund [mailto:janne_l...@yahoo.com] Sent: woensdag 30 juni 2010 17:28 To: users@subversion.apache.org Subject: out of date branches Hi all, I would like to know if there are any recommendations as to enforce a team to always branch from the latest revision of a branch. There's a big risk that a developer might have forgotten to update a branch, then does a replace (in TortoiseSVN) which overwrites a more recent version of a file. How can this be prevented? Via hook-scripts, settings in TortoiseSVN. I prefer doing SVN copy via right-click drag-n-drop in TortoiseSVN than doing a cryptic Merge. I want to set a good process to ensure that a team never overwrites new stuff.... Thanks Jan
