[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 0/6] Patches to avoid use of make recursion in the 'src/' sub
From: |
Jim Meyering |
Subject: |
Re: [PATCH 0/6] Patches to avoid use of make recursion in the 'src/' subdir |
Date: |
Fri, 31 Aug 2012 16:10:17 +0200 |
Stefano Lattarini wrote:
> On 08/31/2012 03:57 PM, Jim Meyering wrote:
>> Stefano Lattarini wrote:
>>
>>> On 08/31/2012 03:34 PM, Jim Meyering wrote:
>>>> Stefano Lattarini wrote:
>>>>> These should go on the top of my other pending series "[PATCH 0/7] Minor
>>>>> cleanup and refactoring":
>>>>>
>>>>> <http://lists.gnu.org/archive/html/coreutils/2012-08/msg00205.html>
>>>>
>>>> Thanks! Looking at these now.
>>>> FYI, I pushed that other series an hour ago.
>>>>
>>> Ouch, some of them still have the S-o-B line! Can you delete those, or
>>> should I resend?
>>
>> No problem. As I tried to apply them with "git am FILE",
>> the new commit hook complained and left me in the editor,
>> where I removed them.
>>
>> However, 3/6 failed to apply.
>>
> Are you applying with "git am -3", right? Otherwise, merge conflicts that
> can be solved automatically won't be.
Yes. Here's what I hit with your original series
$ git am -3 k
Applying: maint: add our 'bootstrap_post_import_hook' function
Applying: build: refactor how lists of coreutils programs are defined
Applying: build: don't use recursive make to build the 'src' subdirectory
fatal: sha1 information is lacking or useless (cfg.mk).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0003 build: don't use recursive make to build the 'src'
subdirectory
The copy of the patch that failed is found in:
/h/j/w/co/cu/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
> Anyway, I can resend the series (now rebased on latest master) if that
> would make things easier ....
I worked around that problem, but as mentioned separately,
I'm seeing numerous make syntax-check problems, and for those
I would appreciate a re-spin.
- [PATCH 1/6] maint: add our 'bootstrap_post_import_hook' function, (continued)
- [PATCH 1/6] maint: add our 'bootstrap_post_import_hook' function, Stefano Lattarini, 2012/08/31
- [PATCH 6/6] maint: remove unused target 'install-root', Stefano Lattarini, 2012/08/31
- [PATCH 4/6] build: fix generation of manpages for programs not built by default, Stefano Lattarini, 2012/08/31
- [PATCH 3/6] build: don't use recursive make to build the 'src' subdirectory, Stefano Lattarini, 2012/08/31
- [PATCH 5/6] maint: improve remake rules for maintainers, Stefano Lattarini, 2012/08/31
- [PATCH 2/6] build: refactor how lists of coreutils programs are defined, Stefano Lattarini, 2012/08/31
- Re: [PATCH 0/6] Patches to avoid use of make recursion in the 'src/' subdir, Jim Meyering, 2012/08/31
- Re: [PATCH 0/6] Patches to avoid use of make recursion in the 'src/' subdir, Stefano Lattarini, 2012/08/31
- Re: [PATCH 0/6] Patches to avoid use of make recursion in the 'src/' subdir, Jim Meyering, 2012/08/31
- [PATCH v2 0/9] Patches to avoid use of make recursion in the 'src/' subdir, Stefano Lattarini, 2012/08/31
- [PATCH v2 1/9] maint: add our 'bootstrap_post_import_hook' function, Stefano Lattarini, 2012/08/31
- [PATCH v2 3/9] build: don't use recursive make to build the 'src' subdirectory, Stefano Lattarini, 2012/08/31
- [PATCH v2 2/9] build: refactor how lists of coreutils programs are defined, Stefano Lattarini, 2012/08/31
- [PATCH v2 4/9] build: fix generation of manpages for programs not built by default, Stefano Lattarini, 2012/08/31
- [PATCH v2 7/9] maint: fix and simplify maintainer checks, Stefano Lattarini, 2012/08/31
- [PATCH v2 6/9] maint: remove unused target 'install-root', Stefano Lattarini, 2012/08/31
- [PATCH v2 5/9] maint: improve remake rules for maintainers, Stefano Lattarini, 2012/08/31
- [PATCH v2 8/9] maint: fix one stray reference to src/Makefile.am, Stefano Lattarini, 2012/08/31