On 8/15/05, Martin Tomes <lists@tomes.org> wrote:
> 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.
We always start with a clean working copy.
>
> --
> 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 Wed Aug 17 05:43:51 2005