* Sam Hartman <hartm...@debian.org> [141001 03:33]:
> I'm packaging software that uses the ident tag in .gitattributes in the
> upstream git directory.
> Basically all the files in the tree have a $Id$ tag.
> Why, I don't know; I thought we all learned we hated that back in the
> bad old days of cvs.
>
> Unfortunately this produces really unfortunate results with patches.
> Attached is an example of the uunrepresented changes in a package I'm
> working on:
>
>
> I'm not quite sure how git dpm update-patches generates patches but it
> manages to capture the patches with the old blob IDrather than with the
> blob ID that results from the merged content.
>
> So, dpkg-source claims there are unrepresented upstream changes in the
> form of all the blob id updates for all the files patched by git dpm.
This is quite an ugly problem. git-dpm just uses git-format-patch and
that as far as I see it has no way to generate the proper patches.
Even worse removing the .gitattribute file usually does not help either,
as it caused git to put something different in the internal storage than
what the file actual has (so removing the .gitattribute will make git
claim the content of the file changed).
The only way I see around this is importing a tarball of the sources
on top of it (for example using git-dpm import-new-upstream).
If the tarball contains the .gitattribute even that will
not help without the new --exclude option added it git-dpm 0.9.
Bernhard R. Link
--
F8AC 04D5 0B9B 064B 3383 C3DA AFFC 96D1 151D FFDC
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
