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

Reintegrate-like merges and diff_ignore_ancestry

From: Ivan Zhakov <ivan_at_visualsvn.com>
Date: Wed, 23 Jan 2013 17:02:31 +0400


I was testing recent changes in ra_serf update editor and noticed that
reintegrate-like merges for long living branches are extremely slow.
Client requests server for diff between branches with respect to
ancestry and servers reports no-op txdelta for every file that was
changed in original branch. Then for every such file client retrieves
text and properties.

For example try to reintegrate ev2-export branch back to trunk.

What is the purpose of diff_ignore_ancestry for merges? Can we default
it to FALSE?

I've made simple patch that changes unconditional diff_ignore_ancestry
= FALSE to TRUE in merge_cousins_and_supplement_mergeinfo() call and
everything seems to be working and ALL tests are passing.

Ivan Zhakov

Received on 2013-01-23 14:03:25 CET

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

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