svn merge output

Hi All,

I'm running a subversion 1.1.1 server ( on a Windows 2000 Server ) &
my client is a Linux box running subversion 1.2.1 .

When i do svn merge operations, the output from svn merge command does
not show all the conflicted files. But when i run svn status the
output includes more conflicted files. This behavior is unpredictable
& is usually observed with binary files. We do a lot of svn merge
operations between various branches daily, using a MergeTool that
parses the output of svn merge. Can we rely on the output of svn merge
or should we check the output of svn status ?

TIA,

Regards,
Jose.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 13 07:58:01 2005