Re: Reintegrate-like merges and diff_ignore_ancestry

On 01/31/2013 06:15 PM, Bert Huijben wrote:
> Shouldn't the svn_fs_contents_changed() just return the right value we need here?

svn_fs_contents_changed() was not designed to be used to detect when two
files have different content, but really to detect when the contents of a
given file have changed across two points in its history. For the purposes
of preserving accurate history, certain bits of code (such as the repos dump
code) needs to care about this distinction. For example, it's not an error
from the FS API point of view to call svn_fs_apply_textdelta() and
explicitly set a file's contents to exactly what they were before you made
the edit. But we try to preserve that fact when dumping rather than claim
that the file didn't change at all (despite there being a change of modified
parent directories and an associated `changes' table entry which claim
otherwise.)

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Enterprise Cloud Development