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

RE: Ignore Directory on Merge

From: Daniell, Casey B <Casey_Daniell_at_reyrey.com>
Date: 2006-07-31 23:38:29 CEST

Does anyone have an approach to the below? Manually deselecting files
that you don't want committed, and hence merged from one branch to the
other, is not a good option.
 
Casey

________________________________

From: Daniell, Casey B
Sent: Monday, July 17, 2006 1:03 PM
To: users@subversion.tigris.org
Subject: Ignore Directory on Merge

All,
 
Is there a way to ignore a specific directory when performing merges? I
don't want to merge our SQL directory around, but do want this code in
version control, so I can't utilize the svn:ignore property.
 
Any other ideas how to ignore this directory when performing merges? (I
have just not committed these files, but would like a method that
doesn't require having to "know" not to check in a directory and its
contents.)
 
Thanks
Casey
Casey Daniell
Configuration and Release Manager
Reynolds Web Solutions
www.reynoldswebsolutions.com <http://www.reynoldswebsolutions.com/>

Confidentiality Statement:
This message is confidential and may contain confidential information it
is intended only for the individual[s] named herein. If this message is
being sent from a member of the legal department, it may also be legally
privileged. If you are not the named addressee[s] you must delete this
email immediately do not disseminate, distribute or copy.

 

 
Received on Mon Jul 31 23:40:50 2006

This is an archived mail posted to the Subversion Users mailing list.