unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Yuri Khan <yuri.v.khan@gmail.com>
Cc: rgm@gnu.org, michael.albinus@gmx.de, emacs-devel@gnu.org
Subject: Re: master abf0823 2/2: New test tramp-test30-make-auto-save-file-name
Date: Wed, 27 May 2015 21:10:19 +0300	[thread overview]
Message-ID: <83oal5yjqs.fsf@gnu.org> (raw)
In-Reply-To: <CAP_d_8Vpy+wBrj=C1HpWZFqt3mKneUEmoty5y5KijG2DCtXZZA@mail.gmail.com>

> From: Yuri Khan <yuri.v.khan@gmail.com>
> Date: Thu, 28 May 2015 00:04:20 +0600
> Cc: Eli Zaretskii <eliz@gnu.org>, Glenn Morris <rgm@gnu.org>, Emacs developers <emacs-devel@gnu.org>
> 
> On Wed, May 27, 2015 at 11:39 PM, Michael Albinus
> <michael.albinus@gmx.de> wrote:
> 
> > But isn't it stupid, that we get rid of ChangeLogs, and afterwards
> > people start to mimic them for convenience?
> 
> The point of getting rid of changelogs is so that you no longer have
> to merge them. And changelogs are a kind of files which are very
> conflict-prone.

Only if you don't have git-merge-changelog installed and configured in
Git.



  reply	other threads:[~2015-05-27 18:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20150527134830.719.88862@vcs.savannah.gnu.org>
     [not found] ` <E1Yxbh9-0000Cc-Lr@vcs.savannah.gnu.org>
2015-05-27 15:41   ` [Emacs-diffs] master 3953c4b 1/2: Improve tramp-handle-make-auto-save-file-name Dmitry Gutov
2015-05-27 15:50     ` Eli Zaretskii
2015-05-27 16:53       ` Michael Albinus
     [not found] ` <E1YxbhA-0000Cl-3b@vcs.savannah.gnu.org>
2015-05-27 16:02   ` master abf0823 2/2: New test tramp-test30-make-auto-save-file-name Glenn Morris
2015-05-27 16:59     ` Michael Albinus
2015-05-27 17:08       ` Eli Zaretskii
2015-05-27 17:39         ` Michael Albinus
2015-05-27 18:04           ` Yuri Khan
2015-05-27 18:10             ` Eli Zaretskii [this message]
2015-05-27 18:10           ` Eli Zaretskii
2015-05-27 19:48           ` Stefan Monnier
2015-05-29 15:57       ` Stephen Leake

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=83oal5yjqs.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=michael.albinus@gmx.de \
    --cc=rgm@gnu.org \
    --cc=yuri.v.khan@gmail.com \
    /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).