[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge output

From: Martin Tomes <lists_at_tomes.org>
Date: 2005-08-15 10:36:53 CEST

Jose Thomas wrote:
> 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 ?

Are you resolving (svn resolved) all the conflicts? If you are not then
the conflicts will remain and status will show the accumulated conflicts
from all your merges whereas the merge command will list the ones from
that merge.

Martin Tomes
echo 'martin at tomes x org x uk'\
  | sed -e 's/ x /\./g' -e 's/ at /@/'
Visit http://www.subversionary.org/
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 15 10:38:39 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.