svn merge --reintegrate results in a false text conflict set on a binary file
From: Pavel K. <itfixedit_at_gmail.com>
Date: Mon, 28 Dec 2009 13:04:29 +0900
Hello everybody,
I have discovered a scenario when svn merge --reintegrate results in a false
The scenario is simple:
svn, version 1.5.6 (r36142)
svn, version 1.6.6 (r40053)
Subversion server version in both cases:
> svn pl iota.tgz
> svn pg svn:mime-type iota.tgz
Any comment would be very appreciated! Is there anything I do wrong?
A reproduction script is attached.
uname -a
Best regards,
P.S. sending once again, since I haven't seen this email in the mailing list
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.