spurious (U)pdate and (A)dd notifications during merge

http://subversion.tigris.org/issues/show_bug.cgi?id=2910







------- Additional comments from pburbatigris.org Wed Oct 24 10:08:43 -0700 2007 -------
Attached a patch that fixes case 2.  Passes the test
suite...but if someone more
familiar with the libsvn_wc/merge.c code can take a look
that would be great.

[[[
Partial fix for issue #2910 Spurious Update/Add
notifications during merge.

Stop spurious file 'U'pdate notifications during no-op
merges that occur
only because the svn:eol-style on the destination file
results in line
endings other than <LF>.

* subversion/libsvn_wc/merge.c
  (maybe_update_target_eols): Add boolean flag to
communicate if update
  occurred or not.
  (svn_wc__merge_internal): Update call to
maybe_update_target_eols().  If
  maybe_update_target_eols() didn't update the target (i.e.
there were no
  changes to svn:eol-style in the applied range) don't
compare the
  actual WC target to the result target we've constructed,
the former may
  differ only in EOLs and svn_io_files_contents_same_p()
will rightly say
  the files are different and this ultimately leads to a
spurious 'U'pdate
  notification.  Rather, use the temporary target we've
constructed with
  svn_diff_file_output_merge() as it is normalized for
EOLs.
]]]

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org