[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-users
Subject:    
From:       Nick Thompson <nickthompson () agere ! com>
Date:       2006-07-10 14:18:56
Message-ID: 200607101518.56948.nickthompson () agere ! com
[Download RAW message or body]

Hi,

The internal svn diff3 algorithm seems to be as good as any external 
tool I've ever tried, so I would like to make the most use of it. On 
the other hand, when conflicts are detected, I'm left high and dry 
and have to call a merge resolution tool myself, or edit the 
conflicted file with a text editor.

For convenience, it would be handy to allow svn to resolve everything 
itself normally, but when a conflict is detected, then fall back to 
the --diff3-cmd external tool. This would smooth my work flow, while 
making the most of svn. This latter part is important, as I don't 
want to have to assess the quality of an external tool to do 
automatic merging before letting it silently merge files I might not 
look so closely at. When there are conflicts, of course, I'm already 
looking closely.

Ideally, this setting would make it into the config file as well.

Any opinions?

Thanks,
-- 
> Nick Thompson

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

[prev in list] [next in list] [prev in thread] [next in thread]