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

AW: Problem merging with svn:keywords - now another prob

From: Volker <sanam_dry_chili_at_yahoo.de>
Date: Fri, 4 Apr 2008 04:45:45 +0000 (GMT)

Hi all, sorry, the replay is: - create a file in trunk containing (the 1.44 came from an old CVS keyword expansion) * @version $Revision: 1.44 $ ... * @since $Date: 2008-04-04 06:12:49 +0200 (Fri, 04 Apr 2008) $ - add and commit it - put some changes to the file - svn propset svn:keywords "Date Revision" - commit OK - go to a branch and merge the resulted revision from the trunk - gives the conflict dialogue May I use the propset only solely without text changes ? Greetings Volker Gesendet von Yahoo! Mail. Dem pfiffigeren Posteingang. __________________________________________________________ Gesendet von Yahoo! Mail. Dem pfiffigeren Posteingang. http://de.overview.mail.yahoo.com
Received on 2008-04-04 07:48:58 CEST

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