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

[PATCH] Add error msg when trying to launch external merge tool on prop conflict

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Thu, 12 Nov 2009 21:08:49 +0100

[[[
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Add error message when trying to launch
    an external merge tool for a property conflict.

Patch by: Daniel Nslund <daniel{_AT_}longitudo.com>
]]]

I haven't run make check on this one. There is no tests for the
interactive conflict resolver.

Attaching a script for testing. The msg should be printed when typing
'l' for launch.

/Daniel

Received on 2009-11-12 21:09:03 CET

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