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

RE: out of date branches

From: Bert Huijben <bert_at_qqmail.nl>
Date: Wed, 30 Jun 2010 17:46:49 +0200

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.




From: Jan Lund [mailto:janne_lund_at_yahoo.com]
Sent: woensdag 30 juni 2010 17:28
To: users_at_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....



Received on 2010-06-30 17:47:40 CEST

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.