You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Volker <sa...@yahoo.de> on 2008/04/04 04:34:28 UTC

Problem merging with svn:keywords - now another prob

Dear list,

Testing the keyword expansion with merges in svn-1.5, I can replay the following

- 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 gives the conflict dialogue

May I use the propset only solely without text changes ?

Greetings
Volker







      __________________________________________________________
Gesendet von Yahoo! Mail.
Dem pfiffigeren Posteingang.
http://de.overview.mail.yahoo.com