From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 20:36:32 +0300 Message-ID: <838ue6mq8v.fsf@gnu.org> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <55212DE9.8070806@math.ntnu.no> <83pp7in301.fsf@gnu.org> <55213473.9000703@math.ntnu.no> <55213989.4090404@math.ntnu.no> <83h9sumvuo.fsf@gnu.org> <55217051.5080109@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1428255418 20991 80.91.229.3 (5 Apr 2015 17:36:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:36:58 +0000 (UTC) Cc: eggert@cs.ucla.edu, rms@gnu.org, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 19:36:49 2015 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 1YeoTX-0008De-3B for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:36:47 +0200 Original-Received: from localhost ([::1]:37147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTW-0006No-9v for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:36:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTK-0006NL-L3 for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:36:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoTH-0008K1-FC for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:36:34 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:35484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTH-0008Ju-78; Sun, 05 Apr 2015 13:36:31 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NMC00000GKPSO00@a-mtaout23.012.net.il>; Sun, 05 Apr 2015 20:36:29 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC000KDGWTPT50@a-mtaout23.012.net.il>; Sun, 05 Apr 2015 20:36:29 +0300 (IDT) In-reply-to: <55217051.5080109@math.ntnu.no> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:184938 Archived-At: > Date: Sun, 05 Apr 2015 19:26:41 +0200 > From: Harald Hanche-Olsen > CC: rms@gnu.org, eggert@cs.ucla.edu, emacs-devel@gnu.org >=20 > I notice that you recommend merging master into the task branch, no= t the=20 > other way around, as I indicated. Which is fine. (I didn't write that text.) > But then we get to the =E2=80=9CMerging Into the Upstream Master= =E2=80=9D section, and=20 > there I have some concerns. >=20 > There you merge the task branch into a freshly updated master. Give= n=20 > that you recently merged the other way, that merge could well be a= =20 > fast-forward, which is also fine. But then a little later, you do a= =20 > commit, but won't that usually fail, because you already have a cle= an=20 > working directory? That is, after all, the result of a successful m= erge,=20 > whether fast-forward or not. This survived without changes since the bzr instructions were written= . With bzr, these merges both ways didn't matter. Also, bzr doesn't automatically commit a successful merge, while Git does, which might explain what you see. So I suspect that the instructions need to be revised to some degree, to reflect the differences. Feel free to suggest them, or simply edi= t the page. Thanks.