From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Mon, 06 Apr 2015 17:58:32 +0200 Message-ID: <5522AD28.4030908@math.ntnu.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428335935 31897 80.91.229.3 (6 Apr 2015 15:58:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 15:58:55 +0000 (UTC) Cc: "Stephen J. Turnbull" , eggert@cs.ucla.edu, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 17:58:54 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 1Yf9QL-00044u-VZ for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 17:58:54 +0200 Original-Received: from localhost ([::1]:40619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf9QL-0001lm-Hi for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 11:58:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf9Q8-0001lf-Gd for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:58:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf9Q7-0007fE-IQ for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:58:40 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:35353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf9Q6-0007eL-A6; Mon, 06 Apr 2015 11:58:38 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id ECC4790243F; Mon, 6 Apr 2015 17:58:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::c35:78d:c6ff:48e4] (unknown [IPv6:2001:4662:4ffb:0:c35:78d:c6ff:48e4]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 1E519901396; Mon, 6 Apr 2015 17:58:34 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83r3ryl725.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:185044 Archived-At: Eli Zaretskii wrote: > I agree that separate long-lived changes are better kept in separate > branches, but we have seen several people who are familiar with Git > make silly mistakes that involved two branches, so I'm not sure we > should suggest separate branches to people who want to be as close to > CVS as possible. I was going to ask what sort of silly mistake that might be, but then I=20 thought of one myself: Creating a new branch off the emacs-24 branch,=20 then merging that into the master branch. Or vice versa. It's easily=20 done, and likely to wreak havoc on savannah. Perhaps the risk can be=20 minimized by naming the task branch either master-something or=20 emacs-24-something, to give a clear indication of where it belongs. =E2=80=93 Harald