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

Merge with svn:keywords

From: Rainer Schmidt <RSchmidt_at_advaoptical.com>
Date: 2004-08-31 08:33:37 CEST

Hi,
 
is this behavior o.k.?
 
I have a file xxx in the trunk with property svn:keywords = Id.
The same file in branch has svn:keywords = Date.
 
I merge the branch into the trunk and there is no conflict.

After merge the file in trunk has property svn:keywords = Date. !!!
 
 
Thanks
Rainer
 
Received on Tue Aug 31 10:05:10 2004

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