Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-16 Thread Martin Langhoff
On 8/16/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > However, the -kk change one is a corrupted patch and does not > apply. Your MUA ate leading whitespaces, perhaps. I stupidly did a forward. Rebased to your current pu branch and sent. >From now on I'll be sending straight from cmdline. > I

[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

2005-08-15 Thread Martin Langhoff
[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > So this patch is obsolete too. I take it to mean that it should be dropped and replaced with the one you sent today with -kk change. However, the -kk change one is a corrupted patch and does not apply. Your MUA ate leading whitespaces, perhaps. I

[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

2005-08-15 Thread Martin Langhoff
[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. After

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Martin Langhoff
On 8/15/05, Martin Langhoff <[EMAIL PROTECTED]> wrote: > I think the other modes are relevant in different scenarios. -kv is > only meaningful as file mode over the life of the file in the repo. > -kk is only meaningful when calling cvs update with -j -j parameters > or cvs diff, and is effectively

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Martin Langhoff
On 8/15/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > I was just wondering if we are limiting options for people who > want to convert their own CVS repositories by always using > either -kkv or -ko and nothing else. I think the other modes are relevant in different scenarios. -kv is only meani

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > Do you want just -kv or you'd like to handle all the modes? No, I do not. I was just wondering if we are limiting options for people who want to convert their own CVS repositories by always using either -kkv or -ko and nothing else. Your simply sayi

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: >> ..., in which case instead of a -k option that does not allow >> anything but -ko, making it take an optional single letter >> o/k/b/v might might more sense. A single -k defaulting to -ko >> is fine by me if you did so, because I think that is the m

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Martin Langhoff
On 8/15/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > Isn't cvs default -kkv? You're right, default is -kkv (expand keyword/value every time) and not -kv (expand keyword/value only if previously unexpanded). There's something else in the -kb / -ko distinction according to the protocol descripti

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > I think -kv is just the wrong thing to do if you are migrating to git. > Anyway, this script has so far followed cvs's own default... which is > -kv, and I am generally unwilling to break backwards compatibility. Isn't cvs default -kkv? - To unsubscr

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Martin Langhoff
On 8/15/05, Junio C Hamano <[EMAIL PROTECTED]> wrote: > The discussion between you and Linus since you brought this up > has kept me wondering if -ko is the only thing people may want > to do, or sometimes -kk or even -kb or -kv make sense for some The git-cvsimport script requests the full file a

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > [PATCH] Add -k kill keyword expansion option to git-cvsimport > > Early versions of git-cvsimport defaulted to using preexisting keyword > expansion settings. This change preserves compatibility with existing cvs > imports and

[PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-15 Thread Martin Langhoff
Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. Should improve our chances of detecting merges and reduce imported repository siz

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-14 Thread Martin Langhoff
On 8/15/05, Martin Langhoff <[EMAIL PROTECTED]> wrote: > [PATCH] Add -k kill keyword expansion option to git-cvsimport Bad patch! Please ignore while I fix and resend... apologies. martin - To unsubscribe from this list: send the line "unsubscribe git" in the body of

[PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-14 Thread Martin Langhoff
[PATCH] Add -k kill keyword expansion option to git-cvsimport Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. Should improve