From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Messing with the VC history Date: Sun, 16 Nov 2014 07:17:05 +0100 Message-ID: <87k32vsm8u.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416118660 12121 80.91.229.3 (16 Nov 2014 06:17:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Nov 2014 06:17:40 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 16 07:17:35 2014 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 1Xpt9S-00053Z-SR for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 07:17:35 +0100 Original-Received: from localhost ([::1]:42999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpt9S-0001X4-ED for ged-emacs-devel@m.gmane.org; Sun, 16 Nov 2014 01:17:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpt9J-0001Wv-2v for emacs-devel@gnu.org; Sun, 16 Nov 2014 01:17:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpt9B-00047M-Il for emacs-devel@gnu.org; Sun, 16 Nov 2014 01:17:25 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:58014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpt9B-00047H-C5 for emacs-devel@gnu.org; Sun, 16 Nov 2014 01:17:17 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xpt99-0004yp-Tq for emacs-devel@gnu.org; Sun, 16 Nov 2014 07:17:15 +0100 Original-Received: from 132.red-79-158-48.staticip.rima-tde.net ([79.158.48.132]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 07:17:15 +0100 Original-Received: from ofv by 132.red-79-158-48.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Nov 2014 07:17:15 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 32 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 132.red-79-158-48.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:KlwKR2Fcud2JVVhIuypwKO6xe7A= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:177280 Archived-At: To welcome my first commit to Emacs, some people complicated the VC history with unnecessary noise burying the happy event into a merge-fest. This is my guess about what happened: In d409545 I pushed my change to master. In 9075fcc Stefan merged emacs-24 into his local `master' branch but... when he tried to push the merge it was rejected because of my change. He proceeded to pull, a conflict was found on a Changelog file (of course!) and he resolved it, which created a merge (1a71302). Stefan pushes both merges to master. Then on bc5d86f another actor enters (Jay Belanger) that pushes a merge to master (bc5d86f) with the commit message "Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs" I guess that this merge was generated by a `pull'. Now we have a merge (emacs-24 into master) within a merge (Stefan's) within a merge (Jay's). This can continue indefinitely, creating an spaghetti-like history graph that no ultra-wide monitor could display. IMO we should encourage people to use fetch+rebase instead of `pull', reserving merges for logically-related changes that comprise multiple commits. (I'll not dare to ask why, mysteriously, the emacs-diffs mailing list abstained from mentioning my commit.)