From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Mon, 06 Apr 2015 20:46:07 +0200 Organization: Probably a good idea Message-ID: <86sicd5c40.fsf@dod.no> 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> <87egnyfl5u.fsf@uwakimon.sk.tsukuba.ac.jp> <83r3ryl725.fsf@gnu.org> <5522AD28.4030908@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428345971 2477 80.91.229.3 (6 Apr 2015 18:46:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 18:46:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 20:46:02 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 1YfC23-0004sG-Jf for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 20:45:59 +0200 Original-Received: from localhost ([::1]:41195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfC22-00066y-S8 for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 14:45:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfC1z-00066e-NR for emacs-devel@gnu.org; Mon, 06 Apr 2015 14:45:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfC1w-0002Ye-Dp for emacs-devel@gnu.org; Mon, 06 Apr 2015 14:45:55 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:46507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfC1w-0002YR-6p for emacs-devel@gnu.org; Mon, 06 Apr 2015 14:45:52 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YfC1u-0004kh-7p for emacs-devel@gnu.org; Mon, 06 Apr 2015 20:45:50 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Apr 2015 20:45:50 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Apr 2015 20:45:50 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 8 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:HR9ol7EI5014UUlsNC8XNArtZ5s= 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:185052 Archived-At: >>>>> Harald Hanche-Olsen : > I was going to ask what sort of silly mistake that might be, but then > I thought of one myself: Creating a new branch off the emacs-24 > branch, then merging that into the master branch. Since emacs-24 is ancestral to master, that probably won't be too bad. The other way will be worse.