Re: Is this a bad idea: Merge File to File

On Mon, Jul 20, 2009 at 04:16:25PM -0400, Peter Kahn wrote:
> Merging creates an svn:mergeinfo property on the destination path (branch
> root, directory or file) and if this cannot combined/elided with the parent
> then the property will be modified on subsequent merges creating changes
> without textual differences and making it harder to see what real changes
> happened in the merge.
>
> If users merge files directly (which they have about 20-40 times) then those
> files will be listed as changed each time we merge.
>
> So, I think I should tell my users to favor merging are a higher level on
> the tree.

All of this is correct. We have a policy that all merges must be
conducted from the root of a tree (either trunk/ or
branches/somebranch/).

It isn't necessarily "bad" to merge directly onto a file, but you are
correct about the consequences of merging that way.

> what's the right way to clean this up (to manual elide the mergeinfo
> to as high a level as they will go?)

Yup. You could also delete the svn:mergeinfo if you knew for a fact that
you would never need to track that merge info anymore.

tyler
Received on 2009-07-20 22:28:37 CEST