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-----
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.
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.
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.
This is an archived mail posted to the Subversion Dev mailing list.