On 30/01/13 00:37, Dan McGee wrote: > On Tue, Jan 29, 2013 at 8:25 AM, Dave Reisner <[email protected]> wrote: >> Suggested-by: Dan McGee <[email protected]> >> Signed-off-by: Dave Reisner <[email protected]> >> --- > > Not tested, but exactly what I was thinking on this, so you get my signoff. > > Signed-off-by: Dan McGee <[email protected]> > >> lib/libalpm/Makefile.am | 2 +- >> .../{libarchive-compat.c => libarchive-compat.h} | 19 >> +++++++++++-------- >> 2 files changed, 12 insertions(+), 9 deletions(-) >> rename lib/libalpm/{libarchive-compat.c => libarchive-compat.h} (76%) > > On a tangental note, I love how you can't actually tell a file was > deleted in this diffstat. That's confusing. >
Which is probably the cause of this: > git am -s \[pacman-dev\]\ \[PATCH\]\ inline\ libarchive\ compat\ wrappers.eml Applying: inline libarchive compat wrappers error: lib/libalpm/libarchive-compat.h: already exists in index Patch failed at 0001 inline libarchive compat wrappers ...
