Re: svn resolve: just what does it do?
From: Colin Putney <cputney_at_whistler.net>
Date: 2002-03-15 21:11:19 CET
On Friday, March 15, 2002, at 11:13 AM, Ben Collins-Sussman wrote:
> On the other hand -- now that we have 3 fulltext backup files, 'svn
I think it is.
It's counter-intuitive to have a command with such an important-looking
I'd like to see this sequence of checks happen for svn resolve.
1. If there's a merge tool configured for the conflicted file, it gets
2. If there's no merge tool and the file is not a binary file, the
3. If the wc file has been modified or the --force option is used, the
4. If none of the above conditions are met, svn resolve errors out
This keeps the current behaviour intact — you can still resolve the
Cheers,
Colin
Colin Putney www.whistler.com
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.