Is there any way to get svn to use an external merge tool, but only for
conflicts?
In other words, if I set up an external merge tool like diffuse
(http://diffuse.sourceforge.net/), when svn finds a conflict it just
throws both repository and working copy files at the external merge
tool. In
On Mon, 14 Jan 2013, Warden, Neil wrote:
From: Warren Block [mailto:wbl...@wonkity.com]
Sent: Samstag, 12. Januar 2013 21:24
To: users@subversion.apache.org
Subject: external merge tools for conflicts only
Is there any way to get svn to use an external merge tool, but only
for conflicts?
In
May I humbly request improvements for this error message?
local dir edit, incoming dir delete upon update
The ambiguity of "edit" and "delete" (whether adjectives or verbs) is
confusing every time.
Could it be:
local dir has been modified, but dir has been deleted in repository
Or somet
On Wed, 11 Dec 2013, Les Mikesell wrote:
On Wed, Dec 11, 2013 at 11:16 AM, Bob Archer wrote:
Yes, I understand the export function. I want functionality for release
management into test and production environments.
For these environments I have a few requirements:
Files in these enviro
