notification of merge start shows up too late

[David Glasser <gl...@davidglasser.net>]

The "--- Merging" notification can show up *after* the first conflict
resolver call, if there's a conflict on the first item:

glasser@smiler:/opt/svn/checkouts/in-memory-cache$ svn merge $SR/trunk
Conflict discovered in 'build.conf'.
Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict,
(tc) theirs-conflict,
        (s) show all options: e
[...]
Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict,
(tc) theirs-conflict, (r) resolved,
        (s) show all options: r
--- Merging r30619 through r30947 into '.':
U    build.conf


I'm not familiar with all the "operative notification" machinery in
libsvn_client/merge.c; there's a lot of tricky logic!  Is there
someone more familiar who could fix this (by making sure the
merge-begin gets notified at the actual beginning of the merge, not at
the time of printing the first item's line)?

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org