On Mon, Mar 14, 2011 at 06:33:13PM +0100, Christoph Bartoschek wrote:
> 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 expansi
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 i
Am Montag, 14. März 2011 schrieb Nico Kadel-Garcia:
> On Mon, Mar 14, 2011 at 12:11 PM, 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 i
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:
>
> -/*
> -**
On Mon, Mar 14, 2011 at 12:11 PM, 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_
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: $
-*/
+/* $I
