From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 07:01:05 +0900 Message-ID: <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <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> <837ftspcis.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428184900 4321 80.91.229.3 (4 Apr 2015 22:01:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 22:01:40 +0000 (UTC) Cc: sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 00:01:31 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 1YeW8A-0005P6-C1 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 00:01:30 +0200 Original-Received: from localhost ([::1]:34455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeW89-0007sl-JV for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:01:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeW7w-0007sg-6M for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:01:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeW7v-0002mJ-AF for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:01:16 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:45328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeW7o-0002jx-AZ; Sat, 04 Apr 2015 18:01:08 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 50B791C3890; Sun, 5 Apr 2015 07:01:05 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 2B2D9120EC9; Sun, 5 Apr 2015 07:01:05 +0900 (JST) In-Reply-To: <837ftspcis.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184887 Archived-At: Eli Zaretskii writes: > > It did? It's not clear to me. I still haven't seen an explanation of > > how he ended up with a ton of modified files that he didn't touch, or > > how he's going to get past that safely. > > We've been through that: those are files from the merge already in the > index, ready to be committed when the conflicts are resolved. I've been through that too, I tried to reproduce and failed. My understanding was that Richard had edited and had uncommitted changes *before* "the" pull. Both in theory and by experiment, there should be no merge in the index. The merge doesn't even get started if conflicts are expected and there are uncommitted changes. The reflog also didn't show any pull since the commits Richard did make. So your hypothesis is something like 1. Richard cloned the repo. 2. He did the edit-commit cycle three times (according to reflog). 3. At some point, he did a couple of branch switches (according to reflog; result was a no-op). 3. He pulled (when fully committed), and got a conflict in lisp/Changelog during the merge phase (so no reflog entry). 4. He hasn't edited since (except maybe the ChangeLog) 5. Maybe he has pulled since, but that would have no visible changes (there would be a fetch to origin/master, but no merge at all). ? In that case, yes, commit-pull[-fix-commit]?-push should do the trick. I would recommend a diff (or diffstat) against origin/master to make sure he recognizes all the changes as his own before pushing.