Keywords not collapsed when using ExternalBlobGenerator
James Blackburn <[email protected]> Thu, 4 Aug 2011 15:44:38 +0100
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.devel |
|---|---|
| Message-ID | <CACyv8dcNAXkGkZi-v36HCx8QegCJQr4nzQHDDSdq_kfwqvkrUA@mail.gmail.com> |
------=_Part_17966_917417091.1312469080893
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi All,
This may be a known issue, I found lots of history on the list but didn't
find a resolution...
The default cvs2git.options contains, uses the CVSRevisionReader &
specifies KeywordHandlingPropertySetter('collapsed'). This seems to work
well. Keywords aren't expanded as expected.
However as noted the above is very slow. When using the
ExternalBlobGenerator I notice Keywords are expanded (or perhaps they're
untouched...). Is this a known issue, and is there a workaround?
Expanded keywords checked into git cause all sorts of pain during merge as
they generate a merge conflict at for every file that was touched on both
branches. Hence we'd like to collapse them (and subsequently remove them).
Cheers,
James
------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2809098
To unsubscribe from this discussion, e-mail: [[email protected]].
------=_Part_17966_917417091.1312469080893
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Hi All,<div><br></div><div>This may be a known issue, I found lots of histo=
ry on the list but didn't find a resolution...</div><div><br></div><div=
>The default cvs2git.options contains, uses the=A0CVSRevisionReader & s=
pecifies=A0KeywordHandlingPropertySetter('collapsed'). =A0This seem=
s to work well. =A0Keywords aren't expanded as expected. =A0</div>
<div><br></div><div>However as noted the above is very slow. =A0When using =
the ExternalBlobGenerator I notice Keywords are expanded (or perhaps they&#=
39;re untouched...). =A0Is this a known issue, and is there a workaround?=
=A0</div>
<div><br></div><div>Expanded keywords checked into git cause all sorts of p=
ain during merge as they generate a merge conflict at for every file that w=
as touched on both branches. =A0Hence we'd like to collapse them (and s=
ubsequently remove them).</div>
<div><br></div><div>Cheers,</div><div>James</div><div><br></div>
------=_Part_17966_917417091.1312469080893--