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

RE: Reintegrate-like merges and diff_ignore_ancestry

From: Bert Huijben <bert_at_qqmail.nl>
Date: Wed, 23 Jan 2013 15:51:43 +0100

> -----Original Message-----
> From: Ivan Zhakov [mailto:ivan_at_visualsvn.com]
> Sent: woensdag 23 januari 2013 14:03
> To: Subversion Development
> Subject: Reintegrate-like merges and diff_ignore_ancestry
> Hi,
> 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.

Is there a way the diff code can see that it receives a no-op txdelta?

In that case it can just skip retrieving the file as it won't be able to produce a difference anyway.

> 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.

I don't think I can answer this question.

What I did notice is that your patch sets it to true, so I was a bit confused by your question.

Paul, Julian?

I think the original idea of a reintegrate was that it was theURL-URL diff of [branch start - branch done] applied to the target, based upon the merge info. In that case this change might be safe.

But if we can safely optimize the diff view, we should also do that.

Received on 2013-01-23 15:52:36 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.