[Svnmerge] [PATCH] Transitive merge fix
rasky at develer.com
Fri Aug 10 02:50:17 PDT 2007
On 8/10/2007 11:43 AM, Michael Willmott wrote:
>> This is going to cause two additional "svn propget" for each merge.
>> Can't you use the VersionedProperty cache that was thought
>> specifically for that? You already have merge_metadata() available,
>> and I believe that block_metadata() is already computed at least for
>> the reflected case.
>> Which makes me think that maybe this feature should be gated on
>> --bidirectional :)
>> Notice that all the above might be wrong: I would appreciate if you
>> watched at the output of svnmerge with -vv to prove me wrong (or right
> I had a similar thought, and yes -vv does show additional (and in some
> cases, duplicated) progets. The only concern I have is that this fix
> should be functional regardless of the state of --bidirectional, since
> it prevents merge property conflicts.
I didn't follow the thread, but do these merge property conflicts can
happen in a non-bidirectional scenario?
More information about the Svnmerge