Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Fedora Development (http://www.linux-archive.org/fedora-development/)
-   -   What changelog to preserve at untrivial merging? (http://www.linux-archive.org/fedora-development/109777-what-changelog-preserve-untrivial-merging.html)

Dmitry Butskoy 06-19-2008 03:47 PM

What changelog to preserve at untrivial merging?
 
We've changed /bin/mail command source to the new upstream in rawhide
(see
https://www.redhat.com/archives/fedora-devel-list/2008-June/msg00628.html
for more info).


The new source was already in Fedora, under an alternative name of
"nail". IOW, we currently have /bin/mail provided by mailx-8.1.1, and
/usr/bin/nail, provided by nail-12.3. Since nail-12.3 supersedes all the
features of the old undeveloped mailx-8.1.1 (and has the same upstream
name of "mailx" now), we've decised to switch to it for /bin/mail as well.


As a result, I've copied the "devel" branch of the "nail" package to the
"devel" branch of the "mailx" package (with some adaptation needed).


The question is: What changelog to preserve?

Both packages have their own history. What changelog preserve in the new
mailx in rawhide -- the old entries from mailx-8.x, the new entries from
nail-12.3, or something else?


Regards,
Dmitry Butskoy
http://www.fedoraproject.org/wiki/DmitryButskoy

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

"Callum Lerwick" 06-20-2008 12:31 AM

What changelog to preserve at untrivial merging?
 
On Thu, Jun 19, 2008 at 10:47 AM, Dmitry Butskoy <buc@odusz.so-cdu.ru> wrote:


Both packages have their own history. What changelog preserve in the new mailx in rawhide -- the old entries from mailx-8.x, the new entries from nail-12.3, or something else?
I would consider it a package rename, nail -> mailx, thus the nail changelog should be preserved.


Would it have been more appropriate to just have nail obsolete mailx? What is the actual upstream name?


--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

Patrice Dumas 06-20-2008 07:55 AM

What changelog to preserve at untrivial merging?
 
On Thu, Jun 19, 2008 at 07:31:32PM -0500, Callum Lerwick wrote:
> On Thu, Jun 19, 2008 at 10:47 AM, Dmitry Butskoy <buc@odusz.so-cdu.ru>
> wrote:
>
> > Both packages have their own history. What changelog preserve in the new
> > mailx in rawhide -- the old entries from mailx-8.x, the new entries from
> > nail-12.3, or something else?
>
>
> I would consider it a package rename, nail -> mailx, thus the nail changelog
> should be preserved.
>
> Would it have been more appropriate to just have nail obsolete mailx? What
> is the actual upstream name?

mailx could be kept in fedora, nail doesn't really obsolete it, like a
rename do. I think that the issue here is that a virtual provide should
be used for mail (or a file provide like /bin/mail) such that the
package providing mail can change in time.

--
Pat

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

Dmitry Butskoy 06-20-2008 12:10 PM

What changelog to preserve at untrivial merging?
 
Callum Lerwick wrote:
On Thu, Jun 19, 2008 at 10:47 AM, Dmitry Butskoy <buc@odusz.so-cdu.ru
<mailto:buc@odusz.so-cdu.ru>> wrote:


Both packages have their own history. What changelog preserve in
the new mailx in rawhide -- the old entries from mailx-8.x, the
new entries from nail-12.3, or something else?


I would consider it a package rename, nail -> mailx, thus the nail
changelog should be preserved.


Would it have been more appropriate to just have nail obsolete mailx?


Nope...


What is the actual upstream name?


...because the actual upstream name is "mailx". (It was "nail"
initially, then it was renamed, since the original mailx-8.x development
is stopped long time ago...)


Hence new "mailx-12.3" upgrades the previous one "mailx-8.x" and
obsoletes "nail" (providing /usr/bin/nail symlink for backward
compatibility).



~buc
http://www.fedoraproject.org/wiki/DmitryButskoy

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list


All times are GMT. The time now is 04:19 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.