From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [patch: first impression] Date: Tue, 18 Oct 2022 18:50:50 +0300 Message-ID: <9fa5fa58-d7f2-bb79-e6c6-be01c7edc065@yandex.ru> References: <87fsgyuyh7.fsf@mat.ucm.es> <87k05cw3ps.fsf@mat.ucm.es> <32439d3e-e40b-c2c2-5f5a-34785a1a5790@yandex.ru> <87v8os9o8q.fsf@mat.ucm.es> <877d177mri.fsf_-_@mat.ucm.es> <520c15a0-a82b-657f-c47f-8f030521980a@yandex.ru> <87fsfv1yau.fsf@mat.ucm.es> <43e67d5a-e3f4-3e7d-cd0e-819a08279d7e@yandex.ru> <877d16khai.fsf@mat.ucm.es> <878rlmim4q.fsf@mat.ucm.es> <7ae1356e-ff81-5445-ab6f-bf431678bf69@yandex.ru> <877d16fgfr.fsf@mat.ucm.es> <0cc26283-3e36-d418-6f72-99fa31304a9d@yandex.ru> <87sfjmgoya.fsf@mat.ucm.es> <87v8oh63oq.fsf@mat.ucm.es> <084455a1-cd60-1350-6947-964f255f912e@yandex.ru> <87o7u945xu.fsf@mat.ucm.es> <5df61fcd-f085-c59a-1389-2573fdce40d7@yandex.ru> <877d0x3zwx.fsf@mat.ucm.es> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26621"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Cc: emacs-devel@gnu.org, Arne Babenhauserheide , georges.racinet@octobus.net To: Uwe Brauer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Oct 18 18:00:15 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1okp0n-0006lt-IL for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 18:00:13 +0200 Original-Received: from localhost ([::1]:33930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okp0l-0007cT-Un for ged-emacs-devel@m.gmane-mx.org; Tue, 18 Oct 2022 12:00:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okos1-0001a4-8r for emacs-devel@gnu.org; Tue, 18 Oct 2022 11:51:09 -0400 Original-Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:53025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okorw-0003Xh-JG for emacs-devel@gnu.org; Tue, 18 Oct 2022 11:51:09 -0400 Original-Received: by mail-wm1-x335.google.com with SMTP id l32so11031201wms.2 for ; Tue, 18 Oct 2022 08:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=zGtEEsozcowWMQS7jIyZcwusLlLhuh7dyvUS2QgQIjw=; b=nwMUtfCp3nGytxsvUlRNVcpTvpFy57Ti5hSoeUpYMFjI7wJTblqkPnI0Bz6alhDEWC /GMYAUrIav2Bq5tnX1XIKHuxPkP6VbyJLFxj2b4fL6ylpNafcZqgZusgO67z2ecRE/N/ wb+mnlRb+9j+t1+k6TZYv6pgYwM6Nmigqb0f3b+0FIuzkmNT0wJHDu9yurPb0RF+8eU/ tOxv8JEpGZ9RHmPz1qR+GCOfwSERlgkYhJ7+4KX4H7hrswBizbwsb5/fqUoTkae49ODt yP7MY09d6g8LKpk6mNu7Cgzs4JorBq8zo/7JUCc2Ih75ZX4Sdc2cN+R4TMD8y0rpRuaf jYsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zGtEEsozcowWMQS7jIyZcwusLlLhuh7dyvUS2QgQIjw=; b=5yWXw6OgBwDjPugSRYSDuyJ8JVlERPcamMBQmRuA82mkg2C4R2+3OpYPeD6leUk6Yd YMXGCNC8douxlxDxB2aafWWDSx8q/PVluF29mMOkp1q4gdWpn0B8FBYnLN9pnlUEc9xc obDGLgVNZRSgGllu6GyM6k4pyA0o6gsoTFh6/6/uCi981bSDLwu57V/7nUoBxKEYdK/l yEYkObybpGm6omLl8ZQto8byQ7x37CIRJmf9TIEppAoaprmfKq5oUIjPNNPqypFg5ZSW qTD52kLSqMRE0Icy2sRNXDO7vzLGaeQjB7E0o0IqH6cGGmoFwZq9sVjUoOaD52QKM+e/ wKKQ== X-Gm-Message-State: ACrzQf0IojCgCBWUxoknrw6EpSLgz8cOCFSEcLsXdlw49ffQveEZz8nx Kp+Fy6AuF0pj5Nn8F5NjDiw= X-Google-Smtp-Source: AMsMyM6osh6oH+ZuSFzpmDdFPinaZHmO4eJMeGQvzU6HW0tEfgrzTq4NYp0zNUpAODCR11iw3EKnGA== X-Received: by 2002:a05:600c:46c7:b0:3c6:f57a:d385 with SMTP id q7-20020a05600c46c700b003c6f57ad385mr8828762wmo.78.1666108252862; Tue, 18 Oct 2022 08:50:52 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id k8-20020a05600c1c8800b003b47e75b401sm18100937wms.37.2022.10.18.08.50.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Oct 2022 08:50:52 -0700 (PDT) Content-Language: en-US In-Reply-To: <877d0x3zwx.fsf@mat.ucm.es> Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=raaahh@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:298060 Archived-At: On 18.10.2022 18:38, Uwe Brauer wrote: > I am confused now! That description sounds like > hg update > > to me > but it seems git reset --soft would not call a merge in the case you > describe Right. > what's about > > > hg update -C > > Or is that more like git reset --hard? Yes, 'hg update -C' is like 'git reset --hard', it that it discards uncommitted changes. 'hg update' tries to merge them instead. Just like 'git checkout' might do. Either way, they generally change file contents on disk. 'git reset --soft' (or just 'git reset') doesn't touch file contents on disk.