[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: stripping keywords on commit?

From: Pierre Asselin
Subject: Re: stripping keywords on commit?
Date: Tue, 2 Oct 2007 00:44:38 +0000 (UTC)
User-agent: tin/1.8.3-20070201 ("Scotasay") (UNIX) (NetBSD/3.1_RC3 (i386))

Ted Stern <address@hidden> wrote:

> I am finding Keyword expansion problematic in certain contexts.  In
> particular, merging changes between branches.

When that gets out of hand, I do my merges with
    cvs update -kk -jTAG_1 -jTAG_2

After I've fixed the conflicts and committed the merge, I get rid
of the sticky "-kk" with an "update -A".

pa at panix dot com

reply via email to

[Prev in Thread] Current Thread [Next in Thread]