Re: Ignore Directory on Merge

On Jul 17, 2006, at 20:03, Daniell, Casey B wrote:

> 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.)

You could do the merge, then revert the changes the merge made to the
SQL directory.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 18 00:21:40 2006