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

Re: svn resolve: just what does it do?

From: Ben Collins <bcollins_at_debian.org>
Date: 2002-03-16 04:17:17 CET

On Fri, Mar 15, 2002 at 12:11:19PM -0800, Colin Putney wrote:
>
> 1. If there's a merge tool configured for the conflicted file, it gets
> launched with the wc file and the three conflict fulltexts as
> parameters. When it exits, the conflict fulltexts are deleted and the
> conflict is resolved.
>

Change that to "When it exits with zero exit status...". If the merge
tool exits non-zero, we should not assume that the conflict is resolved.

-- 
 .----------=======-=-======-=========-----------=====------------=-=-----.
/       Ben Collins    --    Debian GNU/Linux    --    WatchGuard.com      \
`          bcollins@debian.org   --   Ben.Collins@watchguard.com           '
 `---=========------=======-------------=-=-----=-===-======-------=--=---'
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 16 04:21:55 2002

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