On Dec 4, 2004, at 7:09 AM, trlists@clayst.com wrote:
> svn 1.1.1, W2K
>
> I have two branches, development and release, and merged some bug fixes
> from the release branch into the development working copy by merging
> the whole source directory. It appears that the svn:ignore property in
> the release branch came along with the merge, which makes sense as it's
> a property of the directory. However the things I want ignored are not
> the same in the two branches so this was not the desired behavior. I
> can reset it as I keep the ignores for each directory in a text file in
> that directory, but I'm wondering if there is a way to prevent this
> when merging a whoe directory.
>
If you tell 'svn merge' to merge a whole directory, there's no way to
have the command pay attention to some differences and ignore others.
The merge command is really very simple: "compare two trees, and apply
the resulting patch to my working copy". No filters, no fancy
switches, no frills.
However, since the result of 'svn merge' is a bunch of local edits in
your working copy, you're free to review and undo any number of the
changes, before you commit.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 5 02:05:45 2004