Am Montag, 14. März 2011 schrieb Stefan Sperling: > On Mon, Mar 14, 2011 at 05:11:03PM +0100, Christoph Bartoschek wrote: > > Hi, > > > > I would like to merge the changes of a directory in repository A to a > > directory in repository B. My problem is that several merges fail because > > of the id keywords. > > > > Svn diff for example shows: > > > > -/* > > -** $Id: st_opt_small.c,v 1.3 2004/03/08 17:25:57 mueller Exp $ > > It looks like the above Id expansion is from CVS, not from Subversion? > I'd guess the source repository does not have svn:keywords set no this > file, because otherwise it would look different.
Oh, you are right, this is an Id line from TCCS our previous software management system. I guess I have to fix this manually. > > -** > > -** $Locker: $ > > -*/ > > +/* $Id$ */ > > The removed Id line cannot be found in repository B because a different > > user created it. It looks like: > > > > ** $Id: st_opt_small.c 2 2011-03-14 15:17:33Z bartosch $ > > > > > > The merge then fails with a conflict because it cannot find the line of > > the diff. How can I let merge ignore conflicts that arise because of > > expanded Id lines? > > Does the file have an svn:keyword property set in your repository? > If so, have you tried removing it? > > Maybe this is due to auto-props settings in your local configuration file? > > > Or how to prevent Id expansion locally and in the diffs? > > It's controlled via svn:keywords properties: > http://svnbook.red-bean.com/nightly/en/svn.advanced.props.special.keywords. > html The keyword is set and I do not want to change it because I just want to import the changes from repository A to repository B. The guys that set the keyword definitively want to see it. I want to disable the expansion only for my workarea where I merge the changes from repository A to repository B. If the code is then checked out from repository B the expansion should take place with the new revision numbers. Christoph
