>Quoth Daniell, Casey B <mailto:Casey_Daniell@reyrey.com>:
> 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.
[...]
> 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.)
Gavin Lambert:
You could move the SQL directory to somewhere where it isn't getting
merged. (eg. if your base merge folder is /trunk/source, move your SQL
folder to /trunk/SQL)
If you can't move the folder relative to your working copy, you could
probably achieve much the same effect by using svn:externals. I don't
think they get used as part of a merge.
---------------------
Ok, thanks for the ideas. I like the idea of moving the SQL up from
/trunk/source to /trunk/SQL to accommodate the merges. This lets me
still maintain the SQL on each branch, but without having to worry about
merging in the code.
Casey
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 1 18:44:39 2006