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 06:27:04 +0000 Message-ID: <87pmer0xtz.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17650"; 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 08:36:48 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 1okJjz-0004Ns-Tg for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 08:36:47 +0200 Original-Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okJjw-0003TX-FK for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 02:36:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okJar-0007UV-Bd for emacs-devel@gnu.org; Mon, 17 Oct 2022 02:27:24 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:41763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okJam-00017R-6Q for emacs-devel@gnu.org; Mon, 17 Oct 2022 02:27:21 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 263FA240103 for ; Mon, 17 Oct 2022 08:27:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1665988034; bh=n4OQbslhZX/l74sC/fHAtBoAOR+seIG7h+s5kMfEtQM=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=p2cD4w6RN9sRrE1KBA3gOn6LnnyUFAxCFTRTRfgwo84ExaWvnusDJhSoWioTebuVh vvoOUNxS8Bdb0fJGtg9HOvZaU64Agns6zlrjVF+Gs0VK6cUVPJVho10BxzfQSUYb0n W/Rkk4oWEiAfRIUL0/rjpKiEPpDDXPaqUyeEeDI0NGhayik4pzHdvXRSnf77BlnTfq cijqvq5XGawjZfoJTsLTstVKIE93ErUPHDZUpL0Ad6I21mBgjfGB9Kk9tMO4VsEmL9 kXppxpf9IDeDOSwTotHcdcyrkolvtsYsOZ7GKfuxS005OMCIhyzgndGfgG74U8Wk8X ychQNd7UrX3zQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MrRqN3NBDz9rxH; Mon, 17 Oct 2022 08:27:12 +0200 (CEST) In-Reply-To: <834jw33rmx.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 17 Oct 2022 09:12:38 +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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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:297919 Archived-At: Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org >> Date: Sun, 16 Oct 2022 22:22:42 +0000 >> >> > From the shell prompt, "git pull" will fail if the changes are in the >> > same file as one of those whose changes are brought in by the pull, >> > but either using --rebase or maybe the stash/pull/unstash dance should >> > take care of that, I guess? >> >> Right, I believe it was something along these lines but this is >> something that is difficult to automate. > > 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.