Package: gitpkg Version: 0.17 Hi!
So, I finally cleaned up and tested my patchset for gitpkg. The diff is against 0.17 from the repo at http://git.debian.org . The url at https://alioth.debian.org/anonscm/git/users/ron/gitpkg.git is out of sync, by the way, probably the update hook got screwed, so please fix it as well. 1) The first patch fixes a typo and adds support for xz where is was forgotten for the sake of uniformity. 2) The second patch introduces --use-epoch option, which forces git-debimport to parse dsc files in order to find out the epoch information and sort the diffs / tars accordingly. The test case I used was mc. 3) The third patch introduces --resolve-upstream option, which forces git to resolve merge conflicts in favor of upstream hunks. Again, this was sufficient to properly reconstruct the history of mc. 4) The forth patch I am attaching here for history, but I think it is evil. I want you to have a look at it and think if it should be dropped at all. The reason for it as I have outlined on IRC already is that it further improves the chances of a clean merge, BUT hides potential wreckage! Git will not merge be default, if files have been changed by "us", but removed by "them". This patch resolves this situation manually, by removing the files. However, the reason why I ran into this problem, is that some of the tarballs were broken. Then I had a chance to investigate the situation. So I am not quite convinced that it's safe enough to have it enabled by default. Maybe yet another option is needed if we want to include it??? Thanks! -- Sincerely yours, Yury V. Zaytsev
0001-Streamline-support-for-compression-algorithms.patch
Description: application/mbox
0002-Introduce-new-use-epoch-option.patch
Description: application/mbox
0003-Introduce-new-resolve-upstream-option.patch
Description: application/mbox
0004-Make-resolve-upstream-more-resilient-by-solving-some.patch
Description: application/mbox
