From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: vc-dir operation is very slow on large git repositories in Emacs 26.1 Date: Thu, 28 Jun 2018 16:38:07 +0300 Message-ID: <838t6zowu8.fsf@gnu.org> References: <83k1qtsbgi.fsf@gnu.org> <30712254-6225-c6a8-1457-698c64e37739@yandex.ru> <83zhzltyii.fsf@gnu.org> <5218794b-b9ef-3c0d-d3c1-bf40c42e64b2@yandex.ru> <83r2kxtk9w.fsf@gnu.org> <5095ed13-d4a8-1699-26f9-746afaee0248@yandex.ru> <83in66sxig.fsf@gnu.org> <87bmbxbmvz.fsf@javad.com> <132e0090-3e44-dacf-2926-63624b3bb718@yandex.ru> <87fu19rlir.fsf@tromey.com> <340e65ee-dd83-74e9-4531-e8422064536b@yandex.ru> <837emkqn5o.fsf@gnu.org> <40619f2d-1628-a9e7-7674-4d44789f2437@yandex.ru> <83muvfoyte.fsf@gnu.org> <144beaa1-0989-b8f3-126a-6a6525d1b219@yandex.ru> <83fu17oy0n.fsf@gnu.org> <08db66ab-d61b-bf70-9ee9-ca8245c7d11a@yandex.ru> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1530192967 4783 195.159.176.226 (28 Jun 2018 13:36:07 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 28 Jun 2018 13:36:07 +0000 (UTC) Cc: alexharsanyi@gmail.com, tom@tromey.com, sorganov@gmail.com, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 28 15:36:03 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYX5e-00017A-M0 for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 15:36:02 +0200 Original-Received: from localhost ([::1]:36759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYX7l-00046M-8y for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 09:38:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYX7f-00046F-45 for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:38:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYX7a-0000Q4-Ow for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:38:07 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYX7a-0000Pj-ME; Thu, 28 Jun 2018 09:38:02 -0400 Original-Received: from [176.228.60.248] (port=1152 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fYX7Z-0003UY-7i; Thu, 28 Jun 2018 09:38:02 -0400 In-reply-to: <08db66ab-d61b-bf70-9ee9-ca8245c7d11a@yandex.ru> (message from Dmitry Gutov on Thu, 28 Jun 2018 16:18:52 +0300) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:226812 Archived-At: > Cc: alexharsanyi@gmail.com, tom@tromey.com, sorganov@gmail.com, > emacs-devel@gnu.org > From: Dmitry Gutov > Date: Thu, 28 Jun 2018 16:18:52 +0300 > > On 6/28/18 4:12 PM, Eli Zaretskii wrote: > > > Yes, and I still don't think I understand what "unmerged" means in > > this context. Can you explain? To me, "merging" only has meaning > > when more than one branch is considered, or two instances of a single > > branch that diverged. > > And what does the "conflict" status mean to you? You are saying that "unmerged" alludes to files that failed to merge, i.e. "in conflict" in our parlance? If so, fine with me. I just wonder why didn't Git documentation say so.