Re: Directory Merges and svn:ignore

Ben Collins-Sussman <sussman@collab.net> writes:

> On Dec 4, 2004, at 7:09 AM, trlists@clayst.com wrote:
>>
>> [merge applies properties in wc]
>>
>
> 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.

One could argue that merging in a change to a property that is already set
and has a different value is a conflict. So it should be subject to
conflict resolution as for file content edits. If Subversion just
overwrites property values silently we may not notice it and loose data.

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

Yes you should always review changes before committing.

Best regards,
Niels

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 7 09:50:12 2004