On 16. 3. 26 21:01, Timofei Zhakov wrote:
On Mon, Mar 16, 2026 at 8:55 PM<[email protected]> wrote:
Author: rinrab
Date: Mon Mar 16 19:55:15 2026
New Revision: 1932345
Log:
On the 'utf8-cmdline' branch: Sync with trunk, resolving minor conflicts in
svn_opt.h (left unchanged).
[strip]
The email notification lacks detailed diffs. Is that because the
mailer recognises that this was a merge or it just stops after a
certain size? I don't think there is a general way to determine if a
file was merged or just modified.
In other words, is this a guarantee that a merge was performed correctly?
Nope. There is never any guarantee that a merge is correct, other than
reviewing the changes. You did merge to your working copy, then commit:
all you know is that svn didn't find any conflicts. That's not the same
as "merge was correct".
-- Brane
