From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS Date: Mon, 17 Oct 2022 17:23:23 +0000 Message-ID: <878rle1i0k.fsf@posteo.net> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <20220214140020.04438C00891@vcs2.savannah.gnu.org> <87bkqmqpvb.fsf@posteo.net> <87edv96q4j.fsf@posteo.net> <83tu455a5s.fsf@gnu.org> <87a65v2ytp.fsf@posteo.net> <834jw33rmx.fsf@gnu.org> <87pmer0xtz.fsf@posteo.net> <83wn8z2aze.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28280"; mail-complaints-to="usenet@ciao.gmane.io" Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 17 19:25:28 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 1okTrj-00079X-SA for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 19:25:27 +0200 Original-Received: from localhost ([::1]:33320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okTri-0005o9-KL for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 13:25:26 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okTpq-0003OA-Nr for emacs-devel@gnu.org; Mon, 17 Oct 2022 13:23:30 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:58243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okTpn-0000b3-SC for emacs-devel@gnu.org; Mon, 17 Oct 2022 13:23:29 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4DCAF240104 for ; Mon, 17 Oct 2022 19:23:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1666027405; bh=colr3oj6fFel8IXv8N6aOuQ4aXZs7RHkGkQlLWoiJug=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=VWWRla38lE3odyeQAuKZqDt+kYSsZqDjNilvEAVQt1dv0Buwd8KUgMtiyRzqqd7jh H++1NJPHqSTpWh+aydzLfDhgwnA4BByr5ctERzPOqNFpa/fpRyA87gV4CgkbPFgmcl Od/4Pi31j3n9n9VVvk9Mq+QNZ5bqrKrThw8bx1BCPxpgNlYwyN36/IZFeYbQmYLi+o b6afVEzOkBNanusLmqybOq3KaLpVk6TNvcR8N+cSzmvonowt/JeKLjrTWtwzwz+88s wuLkvrgeodZWH5jWcOXxxy5cMpj05iG6MTUTX5/aCATY5zcyqrqmJKqvambV9EYkI+ a7JXG6m9ooBSQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MrkNX289zz6tnx; Mon, 17 Oct 2022 19:23:24 +0200 (CEST) In-Reply-To: <83wn8z2aze.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 17 Oct 2022 09:57:41 +0300") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:297972 Archived-At: Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org >> Date: Mon, 17 Oct 2022 06:27:04 +0000 >> >> Eli Zaretskii writes: >> >> > Can you elaborate on the "difficult" part? You could always stash any >> > local changes before pulling, then un-stashing them after. This >> > should work reliably, I think? >> >> Difficult in the sense that to my knowledge there is no --dwim flag to >> tell Git to try and avert a conflict at any cost. Instead you would >> have to know what the right operation is depending on the current state >> of the repository and the kinds of conflicts that pulling creates. > > If the changes are in the same parts of a file, merge conflicts are > inevitable, and are a necessary part of this kind of operation. So > why is that perceived as a problem? > > I think we should try to avoid conflicts and failures where a > simple-minded merge will do. But if a conflict is inevitable, we > should punt and let the user fix that. The issue I believe I had was that package-vc uses vc-ignore to add a few files to the list of ignored files, and this could trigger an "unnecessary" conflict when updating the package. But I believe that this only occurs if the .gitignore file was modified in upstream source.