From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 3 Apr 2016 11:17:08 +0000 Message-ID: <20160403111708.GA3537@acm.fritz.box> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1459682082 13872 80.91.229.3 (3 Apr 2016 11:14:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 11:14:42 +0000 (UTC) Cc: Emacs developers To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 13:14:36 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1amfzH-00006D-TE for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 13:14:36 +0200 Original-Received: from localhost ([::1]:52876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amfzE-0008Ul-6Y for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 07:14:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amfz0-0008UU-On for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:14:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amfyv-0000rf-Oy for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:14:18 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:41868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amfyv-0000rE-Ir for emacs-devel@gnu.org; Sun, 03 Apr 2016 07:14:13 -0400 Original-Received: (qmail 96748 invoked by uid 3782); 3 Apr 2016 11:14:11 -0000 Original-Received: from acm.muc.de (p548A58C8.dip0.t-ipconnect.de [84.138.88.200]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sun, 03 Apr 2016 13:14:10 +0200 Original-Received: (qmail 4516 invoked by uid 1000); 3 Apr 2016 11:17:08 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202611 Archived-At: Hello, Kaushal. That massive commit happened because of git. I attempted a 'git pull' prior to making a (moderately small) commit. There was a one-letter typo in one of my existing files (which I think had been committed). Because of that, git failed to merge in all the stuff which it had just fetched from savannah, instead prompting me to do a manual merge, which I then did. This is a problem with SCM systems. There is no "undo" for a lot of operations. If I had been aware of what was happening, I might have been able to adjust my copy of the repository somehow so as to avoid that large merge. It would also be nice if such "pseudo merges" could be handled locally, rather than being pushed back to the remote repository, causing confusion. On Fri, Apr 01, 2016 at 01:43:16AM -0400, Kaushal Modi wrote: > OK, I think I need some git education. Me, too! > There was one section in your commit ( > http://git.savannah.gnu.org/cgit/emacs.git/diff/lisp/isearch.el?h=emacs-25&id=ed19f207449c43f7f08285ada87ae7a46c61c8d1 > ) which was already committed earlier ( > http://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/isearch.el?h=emacs-25&id=91e667692ba1362ca1334b8d58fd16c305ad5e2a > ). As I am familiar with that single commit, I know that they are identical. > Also I noted that your commit has a repeat of all the backquote/straight > quote changes in NEWS that happened recently. > But without this prior knowledge, how can one separate these duplicate > commits from the commits that actually are new? > Also, what is the reason for such duplicate commits happening? See above. > Apologies for this git 101 question here. Please forward me to a resource, > if available, where I can understand such mega commits. No apologies needed. git is a complicated, difficult to learn system. > Thanks. -- Alan Mackenzie (Nuremberg, Germany).