Tried git am and that didn't work. Had to merge one of the patches too. I'll add test/testudf.c.in tonight perhaps.
On Wed, Oct 30, 2013 at 8:17 AM, Pete Batard <[email protected]> wrote: > On 2013.10.30 07:17, Rocky Bernstein wrote: > >> Applied in commit 099c431. Thanks. >> > > Thanks, but the commit is missing 'test/testudf.c.in'... > > 3 files should be modified and 1 file created, but the commit only has the > 3 modified files: > > http://git.savannah.gnu.org/**gitweb/?p=libcdio.git;a=**commitdiff;h=** > 099c431dc6750818feb2c3adc4b8de**64d10025a6<http://git.savannah.gnu.org/gitweb/?p=libcdio.git;a=commitdiff;h=099c431dc6750818feb2c3adc4b8de64d10025a6> > > My advice would be to try to use 'git am' to apply pre-formatted patches > (created using 'git format-patch') like the one I sent, as it ensures that > files and authorship are preserved. Then you can use 'git commit --amend' > to alter the commit as you see fit, before pushing it. > > Regards, > > /Pete > > >
