unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: David Kastrup <dak@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Glenn Morris <rgm@gnu.org>,
	eggert@cs.ucla.edu, emacs-devel@gnu.org,
	Andreas Schwab <schwab@suse.de>
Subject: Re: make change-history on non-master branches
Date: Wed, 18 Nov 2015 20:36:50 +0100	[thread overview]
Message-ID: <87bnar6qwd.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <83bnar9mcd.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 18 Nov 2015 20:46:58 +0200")

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Glenn Morris <rgm@gnu.org>
>> Cc: eggert@cs.ucla.edu,  emacs-devel@gnu.org
>> Date: Wed, 18 Nov 2015 13:28:08 -0500
>> 
>> Eli Zaretskii wrote:
>> 
>> > Right.  But if we merge ChangeLog.2 from the release branch to master,
>> > then this will produce a mess when "make change-history" is run on
>> > master, no?  I mean, some entries will appear twice, once after
>> > corrections, the other without.  No?
>> 
>> Quite possibly. I don't know exactly what happens if the commit hash
>> from the ChangeLog.2 footer were to get merged between branches.
>> 
>> I don't know how to solve this problem, but it seems to me that it needs
>> to be solved, and the more master and emacs-25 diverge, the worse it
>> gets.
>
> I agree.
>
> Perhaps Git gurus could help us out?  Andreas, any suggestions?

man git-log

	--cherry-pick
	    Omit any commit that introduces the same change as
	    another commit on the "other side" when the set of
	    commits are limited with symmetric difference.

	    For example, if you have two branches, A and B, a usual
	    way to list all commits on only one side of them is with
	    --left-right (see the example below in the description
	    of the --left-right option). However, it shows the
	    commits that were cherry-picked from the other branch
	    (for example, "3rd on b" may be cherry-picked from
	    branch A). With this option, such pairs of commits are
	    excluded from the output.

[...]

	--cherry
	    A synonym for --right-only --cherry-mark --no-merges;
	    useful to limit the output to the commits on our side
	    and mark those that have been applied to the other side
	    of a forked history with git log --cherry
	    upstream...mybranch, similar to git cherry upstream
	    mybranch.


-- 
David Kastrup



  reply	other threads:[~2015-11-18 19:36 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-15  2:15 make change-history on non-master branches Glenn Morris
2015-11-15  7:11 ` Paul Eggert
2015-11-16 16:02 ` Eli Zaretskii
2015-11-18 18:10   ` Glenn Morris
2015-11-18 18:19     ` Eli Zaretskii
2015-11-18 18:28       ` Glenn Morris
2015-11-18 18:46         ` Eli Zaretskii
2015-11-18 19:36           ` David Kastrup [this message]
2015-11-19  8:35           ` Andreas Schwab
2015-11-19 15:49             ` Eli Zaretskii
2015-11-19 16:35               ` Andreas Schwab
2015-11-19 17:02                 ` Eli Zaretskii
2015-11-19 19:48               ` David Engster
2015-11-19 20:38                 ` Eli Zaretskii
2015-11-19 20:57                   ` David Engster
2015-11-20  0:31                   ` Juanma Barranquero
2015-11-20  8:09                     ` Eli Zaretskii
2015-11-20 16:38                       ` Future release schedules (was: make change-history on non-master branches) John Wiegley
2015-11-20 18:04                         ` Eli Zaretskii
2015-11-20 18:15                           ` Future release schedules John Wiegley
2015-11-20 18:41                           ` Future release schedules (was: make change-history on non-master branches) Artur Malabarba
2015-11-20 18:43                             ` Artur Malabarba
2015-11-20 18:49                             ` Eli Zaretskii
2015-11-20 19:05                               ` Eli Zaretskii
2015-11-20 19:14                                 ` Future release schedules John Wiegley
2015-11-20 21:16                                   ` Eli Zaretskii
2015-11-20 21:33                                     ` John Wiegley
2015-11-21 11:14                                       ` Eli Zaretskii
2015-11-18 19:22         ` make change-history on non-master branches Eli Zaretskii
2015-11-18 20:38           ` Glenn Morris
2015-12-20 18:53         ` Glenn Morris
2015-12-20 21:21           ` Paul Eggert
2015-12-21  0:30             ` Glenn Morris
2015-12-23  1:12               ` John Wiegley
2015-12-23  7:58                 ` Paul Eggert
2016-01-25 16:55               ` Glenn Morris
2016-01-25 17:22                 ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87bnar6qwd.fsf@fencepost.gnu.org \
    --to=dak@gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=rgm@gnu.org \
    --cc=schwab@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).