RE: Reintegrate-like merges and diff_ignore_ancestry

> -----Original Message-----
> From: Ivan Zhakov [mailto:ivan_at_visualsvn.com]
> Sent: donderdag 31 januari 2013 22:50
> To: Paul Burba; Bert Huijben
> Cc: Julian Foad; Subversion Development
> Subject: Re: Reintegrate-like merges and diff_ignore_ancestry

> Thanks for demonstrating use-case. That what I was looking for. We
> cannot change to ignore_ancestry = TRUE by default, but I'm going to
> try the following:
> 1. Add test case for replacement merge that you demonstrated (it would
> be useful anyway)
>
> 2. Modify delta reporter on server side to do not send deltas if files
> have the same content, regardless ancestry (see
> subversion/libsvn_repos/reporter.c:696 delta_files()) Patch attached.
>
> 3. Test it and think a little bit more is it safe change or not :)

I ran the testsuite over it, and it appears to work just fine, but I'm not sure if this is the most optimal fix.

Shouldn't the svn_fs_contents_changed() just return the right value we need here?

I would guess it can perform the same checks as svn_repos__compare_files() but in a way that doesn't depend on the sha1 keys to be available for old repositories.

Stefan, do you know more about this function and why it does what it does today?

        Bert
Received on 2013-02-01 00:16:38 CET