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

Merge bug -- svn:keywords and conflict resolution

From: <Neil.Tuffs_at_rwe.com>
Date: Thu, 31 May 2012 14:36:56 +0100

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).

* The keyword expansion is set to a fixed length in an Oracle forms file, before someone says I shouldn't use keyword expansion on a binary file !!!

Neil Tuffs
Configuration & Release Management

RWE Supply & Trading GmbH
Windmill Hill Business Park
Whitehill Way

Tel (Internal): 7 322 2705
Tel (External): +44 (0)1793 892705
Fax: +44 (0)1793 893560
E-mail: neil.tuffs_at_rwe.com
Received on 2012-05-31 15:37:31 CEST

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