[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Automake-NG] [FYI] tmp: backup-and-move top-level Makefile
|
From: |
Eric Blake |
|
Subject: |
Re: [Automake-NG] [FYI] tmp: backup-and-move top-level Makefile |
|
Date: |
Fri, 10 May 2013 09:03:27 -0600 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130402 Thunderbird/17.0.5 |
On 05/10/2013 08:59 AM, Stefano Lattarini wrote:
> This is just a trick to facilitate the resolution of conflicts in
> the upcoming merge of the master branch, where the to-level Makefile
s/to-/top-/
> has been broken up in several per-subdir makefiles fragments (that
> are then included by the top-level one, thus keeping the build system
> non-recursive).
>
> * Makefile.sav: New, verbatim copy of the "old" Makefile.am.
> * Makefile.am: Make it a symlink to Makefile.sav.
>
> Signed-off-by: Stefano Lattarini <address@hidden>
> ---
> Makefile.am | 709
> +----------------------------------------------------------
> Makefile.sav | 708 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 709 insertions(+), 708 deletions(-)
> mode change 100644 => 120000 Makefile.am
> create mode 100644 Makefile.sav
Any reason why git rename detection is not showing this as a rename?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature