[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 Näslund <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

text/x-diff attachment: launcher_interactive_prop_conflict.diff

application/x-sh attachment: merge-conflict.sh

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

This message: [ Message body ]
Next message: Branko Cibej: "A tiny request for the repository move"
Previous message: Daniel NÃ¤slund: "Re: [PATCH] Replace svn_path_join() in svn/diff-cmd.c"
Next in thread: Stefan Sperling: "Re: [PATCH] Add error msg when trying to launch external merge tool on prop conflict"
Reply: Stefan Sperling: "Re: [PATCH] Add error msg when trying to launch external merge tool on prop conflict"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]