RE: Merging Properties?

I'll forward this to the hive... My statement stands on how Subversion sees your changes. Subversion can't know if changing the properties to "green" simultaneously in different branches is trivial or not. A human has to know the difference.

More experienced users can chime in her if this is a correct interpretation or not.

If you have hundreds of files in this situation, I'd suggest keeping your branches in tighter sync through more frequent merge operations (from trunk to branch, especially). To solve the current situation, write a script.

My two cents.

-Tim

-----Original Message-----
From: Brian Neal [mailto:bgneal_at_gmail.com]
Sent: Thursday, 09 June 2011 9:16 PM
To: Sulser, Timothy (IFPRI)
Subject: Re: Merging Properties?

On Thu, Jun 9, 2011 at 9:05 PM, Sulser, Timothy (IFPRI)
<T.SULSER_at_cgiar.org> wrote:
> Subversion only sees that the changes were made independently on
> precisely the same item.  It knows nothing of the content or impact of
> that change within your code and, rightly so, will identify this
> situation as a conflict.

I guess I don't follow. If the property values are the same, why is
this flagged as a conflict? There is no conflict. What is the
reasoning behind this behavior? Or is this just something that hasn't
had any attention given to it? (I gather not many people use
properties).

>
> Since your using Tortoise, this is easy enough to deal with in the
> situation you describe.  Right-click, edit conflicts, use whichever
> block of text you please, mark as resolved, test the code, commit the
> merge, and be on your merry way.

Except there are hundreds of files like this unfortunately.

>
> -Tim

Thanks,
BN
Received on 2011-06-10 06:35:38 CEST