Hi Team,
Please look into SVN issue.
Tortoise SVN Version Information :
TortoiseSVN 1.6.10, Build 19898 - 32 Bit , 2010/07/16 15:46:08
Subversion 1.6.12,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.3
OpenSSL 0.9.8o 01 Jun 2010
zlib 1.2.3
[cid:image001.png@01CDF321.FFD1EAF0]
<>
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
Paul E writes:
> * Verified revision 135.
> svnadmin: E070014: Can't read file 'E:\\\db\revs\0\135':
> End of file found
This looks like a rep-caching bug: r136 is using the wrong offset into
r135. It appears to be issue 4277 although I'm not aware of anyone ever
triggering it before:
http://s
Hi Warren,
possibly not the answer you are looking for, but hav you tried
http://kdiff3.sourceforge.net/ as merge tool? In case of conflicts it resolves
everything it can do automatically and only non-automatically resolved merge
conflicts left over for manual resolution.
Cheers
Neil
-Ori
