[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: splitting ChangeLogs
From: |
Stefan Monnier |
Subject: |
Re: splitting ChangeLogs |
Date: |
Wed, 06 Apr 2011 12:53:21 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) |
>> > I thought the ChangeLog entries from the emacs-23 branch are merged
>> > manually. If they are merged automatically, then you are right.
>> The merge is automatic, and the resulting conflicts can either be
>> resolved automatically (e.g. via smerge-resolve or a bzr plugin),
>> or manually.
> What conflicts? there are no conflicts (assuming you have the
> changelog_merge plugin).
Well, in my view, the changelog_merge plugin resolves conflicts
resulting from a merge more than it performs a merge, but I don't know
if the implementation matches my mental image of it.
Stefan
- Re: splitting ChangeLogs, (continued)
Re: splitting ChangeLogs, Glenn Morris, 2011/04/06
Re: splitting ChangeLogs, Eli Zaretskii, 2011/04/06
Re: splitting ChangeLogs, Stefan Monnier, 2011/04/06
Message not availableRe: splitting ChangeLogs,
Stefan Monnier <=
Re: splitting ChangeLogs, Eli Zaretskii, 2011/04/06
Re: splitting ChangeLogs, Juanma Barranquero, 2011/04/06
Re: splitting ChangeLogs, Glenn Morris, 2011/04/06
Re: splitting ChangeLogs, Stefan Monnier, 2011/04/06