cvs vs svn... (Re: SOURCES: ghostscript-afpl-am.patch (NEW), ghostscript-afpl-ijs_pkg...)

[Tomasz Pala]

On Wed, Sep 07, 2005 at 10:20:54AM +0100, wrobell wrote:
> 
> svn gives us some advantages. disadvantages? any real, which makes life
> really painful?

How to resolve conflict? I've got a situation:

~: vi blabla
~: svn ci blabla
snv reports conflict here
[fixing it manually]
~: svn ci blabla
svn reports there's unresolved conflict

-- 
Tom Pala <gotar at pld-linux.org>           http://vfmg.sourceforge.net/
                                         http://tccs.sourceforge.net/