Message: previous - next
Month: May 2012

Re: [trinity-devel] Preparing updates for 3.5.13

From: Nix <nix@...>
Date: Wed, 02 May 2012 01:41:48 +0100
On 2 May 2012, Timothy Pearson told this:

>> In the source packages, patches have kept separately from the original
>> sources
>> (in debian/patches/bp*.diff). I was hoping they might be incorporated into
>> Git branch for 3.5.13. I understand that you wanted a big diff instead of
>> the
>> set of patches?
> Honestly I'm not sure how to do this in anything resembling a sane manner
> in GIT.  I was considering distribution of the large patch file as an
> update to the existing 3.5.13 sources, but comments and discussion are
> definitely welcome on this subject!

I'm not quite sure what 'this' is. If you want to apply a bunch of
patches to a git repo, there are multiple options:

git am -- Apply a series of patches from a mailbox
git quiltimport -- Applies a quilt patchset onto the current branch
git apply -- Apply a patch to files and/or to the index

and others.

For a set of Debian diffs, 'git quiltimport' is probably what you're
looking for.

NULL && (void)