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

Re: Merge bug -- svn:keywords and conflict resolution

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 31 May 2012 17:22:41 +0200

On Thu, May 31, 2012 at 02:36:56PM +0100, Neil.Tuffs_at_rwe.com wrote:
> I would like to confirm this issue in v 1.6.17 - using binary files
> via TortoiseSVN. Test scenario was to create a binary file in trunk
> with the "svn:keywords = Revision" property set*; branch the trunk to
> $BAU; change the file in $BAU (and commit); merge the change revision
> from $BAU back into trunk, this reported the file as a conflict
> (performing same on a second file without the property set worked
> without conflict).

Hi Neil,

We don't fix these kinds of bugs in the 1.6 series anymore.
The 1.6 series receives only security or data corruption fixes.

By code inspection I would guess that 1.7 has the same problem, however.
Can you confirm that? If so, please file an issue. I believe there might
be a bug where the merge compares a version of the file with keywords
expanded to a version of a file with keywords contracted. I don't have
time right now to dig deeper so it would be great if you could help by
confirming that the same problem exists in 1.7. Cheers!
Received on 2012-05-31 17:23:18 CEST

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