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

RE: merge - is it possible to ignore/mask certain/all properties?

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-08-11 18:41:36 CEST

> -----Original Message-----
> From: Mark Ryan [mailto:m.ryan@phion.com]
> Is it possible with svn merge to ignore particular properties during
> merge operations?
> For example, we use special 'hotfix' properties on our hotfix
> branches
> that I don't want merging into our release branch.

Not that I know of. However, if you want to prevent hotfix properties
from appearing on non-hotfix branches, you could use a pre-commit hook.
Use 'svnlook proplist', check the pathnames in the commit, and fail if
it's a non hotfix branch. However that wouldn't help you with merges
between two hotfix branches.


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. AL621

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 11 18:43:46 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.