[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] {maint} news: break up in two files, one for maint, one for
|
From: |
Eric Blake |
|
Subject: |
Re: [PATCH] {maint} news: break up in two files, one for maint, one for master |
|
Date: |
Thu, 26 Apr 2012 09:17:40 -0600 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 |
On 04/26/2012 09:14 AM, Stefano Lattarini wrote:
> Now that we only have 'master' and 'maint' as long-lived branches
> (ok, there's 'ng/master' as well, but there we have a separated
> file 'NG-NEWS'), the NEWS changes should merge and sync easily and
> cleanly.
>
> So I wish to take back my proposed patch, and substitute it with
> a trivial patch that just edit '.gitattributes' not to specify the
> "union" merge driver for NEWS anymore.
>
> WDYT?
It's your call as maintainer, for whatever you think will be easiest to
maintain over long-term merges; if our new branching policy makes it
possible to enforce good NEWS entries across both branches, then simpler
is reasonable.
--
Eric Blake address@hidden +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature