From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lele Gaifax Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 23:41:32 +0200 Organization: Nautilus Entertainments Message-ID: <87619bbmgj.fsf@nautilus.nautilus> References: <83twx2xoc8.fsf@gnu.org> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <551FA7F6.8060103@math.ntnu.no> <87wq1rfvvp.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1428183729 18905 80.91.229.3 (4 Apr 2015 21:42:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 21:42:09 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 23:42:01 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 1YeVpI-0000JR-VZ for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 23:42:01 +0200 Original-Received: from localhost ([::1]:34422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVpI-0004Jd-Dn for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:42:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVp6-0004JY-9X for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:41:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeVp1-0002ZK-4u for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:41:48 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVp0-0002Yz-Ua for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:41:43 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeVox-00004u-U4 for emacs-devel@gnu.org; Sat, 04 Apr 2015 23:41:40 +0200 Original-Received: from 151.62.96.249 ([151.62.96.249]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 23:41:39 +0200 Original-Received: from lele by 151.62.96.249 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 23:41:39 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 73 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 151.62.96.249 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) Cancel-Lock: sha1:BEgVMP8zyirfQeD/xBGb1BbWT5Y= 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:184886 Archived-At: "Stephen J. Turnbull" writes: > Harald Hanche-Olsen writes: > > Short summary of such an > > explanation: They are the result of an incomplete merge operation, and > > all come from origin/master at the time of his pull. This may not be the > > *correct* explanation, but it is a *possible* explanation. > > Yes, and I've posted three times mentioning those posts (by Eli as > well as you) and explaining the I have tried to reproduce this in a > toy repo and have been unable to. It's no longer a possible > explanation that he pulled and these were left over *as far as I can > tell*. I worry that it may matter in getting his repo fixed up > properly. AFAICT, the following simple script replicates a similar case, with the same outcome: RD=/tmp/rd_$$ mkdir -p $RD git init $RD/remote cd $RD/remote for f in a b c do echo $f > $f git add $f done git commit -m "Bootstrap" cd $RD git clone remote local cd local echo "local tweak" >> a git add a git commit -m "Local tweak" cd $RD/remote for f in a b c do echo $f >> $f git add $f done git commit -m "Second pass" cd $RD/local git pull git status --short Running it, you end with the following state in the "local" repository: UU a M b M c where you see that the "a" file is "dirty" and contains conflict markers: $ cat a a <<<<<<< HEAD local tweak ======= a >>>>>>> d2f149d20ecc0e259331d82497e0388828d940ad My 2 cents, ciao, lele. -- nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia. lele@metapensiero.it | -- Fortunato Depero, 1929.