Merging from a foreign repository and svn:id keyword

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 $
-**
-** $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?

Or how to prevent Id expansion locally and in the diffs?

Christoph
Received on 2011-03-14 17:11:38 CET