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 15:53:00 +0200 Message-ID: <55228FBC.1080306@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <55212DE9.8070806@math.ntnu.no> <55217D4D.4080207@cs.ucla.edu> <83y4m6l8vw.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 1428328410 6914 80.91.229.3 (6 Apr 2015 13:53:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 13:53:30 +0000 (UTC) Cc: Paul Eggert , 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 15:53:30 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 1Yf7Sx-00058A-QA for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 15:53:27 +0200 Original-Received: from localhost ([::1]:40214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf7Sx-0000kr-Ad for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 09:53:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf7Sl-0000kk-Lt for emacs-devel@gnu.org; Mon, 06 Apr 2015 09:53:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf7Sk-0006gD-Pc for emacs-devel@gnu.org; Mon, 06 Apr 2015 09:53:15 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:37006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf7Sg-0006em-UI; Mon, 06 Apr 2015 09:53:11 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 1019D66ACFA; Mon, 6 Apr 2015 15:53:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.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 hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 8759A66ACEF; Mon, 6 Apr 2015 15:53:02 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83y4m6l8vw.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:185031 Archived-At: Eli Zaretskii wrote: > As others have pointed out, using a separate repository each time does > not guarantee that these problems will not happen. [=E2=80=A6] > > So I think this kind of workflow doesn't save one from any problems > you might encounter with a single clone. It definitely has a > disadvantage of cloning the repository each time, which involves > moving 400MB through the wire, and takes many minutes. That could be helped by using shallow clones, though. You only ever need=20 a full clone if you wish to examine old history, and you could keep just=20 one full clone for that purpose, while having many shallow clones for=20 hacking. If the clone is *too* shallow, I imagine you could get in trouble with=20 merge operations, though. I am not sure about this, but the merge based=20 workflow used seems to produce a history with several parallel branches=20 much of the time, and that could force a merge operation to look further=20 back than you might expect to find a common ancestor to use as a basis=20 for merging. This is pure speculation on my part, though. If one ever=20 runs into this problem, it is easily remedied by running git fetch=20 --depth=3Dn with some suitable n, but it is a potential complication with= =20 this approach. =E2=80=93 Harald